Permalink
Browse files

Merge remote-tracking branch 'qicb/Develop' into Develop

Conflicts:
	Application/Code/CommonClass.cs
	Application/Code/SqlHelper.cs
	Application/Properties/Settings.Designer.cs
	Application/Properties/Settings.settings
	Application/WorkStation.csproj
	Application/app.config
	Application/frmAddItem.cs
	Application/frmAddPoint.Designer.cs
	Application/frmAddPoint.cs
	Application/frmAddRoute.Designer.cs
  • Loading branch information...
2 parents 68abee3 + 6b2e5c7 commit 2d1cde1ca2281fc46e2382ca5a089de63e0e4820 @katway committed Oct 24, 2012
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WorkStation
+{
+ public class CommonClass
+ {
+ }
+ public class BoxItem
+ {
+ private string _text = null;
+ private object _value = null;
+ public string Text { get { return this._text; } set { this._text = value; } }
+ public object Value { get { return this._value; } set { this._value = value; } }
+ public override string ToString()
+ {
+ return this._text;
+ }
+ }
+}

Large diffs are not rendered by default.

Oops, something went wrong.

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

Oops, something went wrong.
@@ -1,8 +1,7 @@
-<<<<<<< HEAD
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
-// 运行时版本:4.0.30319.17929
+// 运行时版本:4.0.30319.269
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@@ -14,7 +13,7 @@ namespace WorkStation.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+ public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -23,33 +22,54 @@ namespace WorkStation.Properties {
return defaultInstance;
}
}
- }
-}
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
+ [global::System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123")]
+ public string ConnectionString {
+ get {
+ return ((string)(this["ConnectionString"]));
+ }
+ }
+<<<<<<< HEAD
=======
-//------------------------------------------------------------------------------
-// <auto-generated>
-// 此代码由工具生成。
-// 运行时版本:4.0.30319.269
-//
-// 对此文件的更改可能会导致不正确的行为,并且如果
-// 重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Application.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool tvRoute {
+ get {
+ return ((bool)(this["tvRoute"]));
+ }
+ set {
+ this["tvRoute"] = value;
+ }
+ }
- public static Settings Default {
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool tvLogicalPoint {
get {
- return defaultInstance;
+ return ((bool)(this["tvLogicalPoint"]));
+ }
+ set {
+ this["tvLogicalPoint"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool tvPhysicalPoint {
+ get {
+ return ((bool)(this["tvPhysicalPoint"]));
+ }
+ set {
+ this["tvPhysicalPoint"] = value;
}
}
+>>>>>>> qicb/Develop
}
}
->>>>>>> hefl
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="DAL.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="WorkStation.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="ConnectionString" Type="(Connection string)" Scope="Application">
@@ -9,5 +9,14 @@
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123</Value>
</Setting>
+ <Setting Name="tvRoute" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ <Setting Name="tvLogicalPoint" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ <Setting Name="tvPhysicalPoint" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
</Settings>
</SettingsFile>
@@ -0,0 +1,37 @@
+<<<<<<< HEAD
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="DAL.Properties" GeneratedClassName="Settings">
+ <Profiles />
+ <Settings>
+ <Setting Name="ConnectionString" Type="(Connection string)" Scope="Application">
+ <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+ &lt;ConnectionString&gt;Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123&lt;/ConnectionString&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+ <Value Profile="(Default)">Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123</Value>
+ </Setting>
+ </Settings>
+=======
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="WorkStation.Properties" GeneratedClassName="Settings">
+ <Profiles />
+ <Settings>
+ <Setting Name="ConnectionString" Type="(Connection string)" Scope="Application">
+ <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+ &lt;ConnectionString&gt;Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123&lt;/ConnectionString&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+ <Value Profile="(Default)">Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123</Value>
+ </Setting>
+ <Setting Name="tvRoute" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ <Setting Name="tvLogicalPoint" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ <Setting Name="tvPhysicalPoint" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ </Settings>
+>>>>>>> qicb/Develop
+</SettingsFile>
@@ -37,7 +37,6 @@
<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" />
@@ -70,17 +69,29 @@
<Compile Include="frmAddRoute.Designer.cs">
<DependentUpon>frmAddRoute.cs</DependentUpon>
</Compile>
+ <Compile Include="frmAddRoutName.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddRoutName.Designer.cs">
+ <DependentUpon>frmAddRoutName.cs</DependentUpon>
+ </Compile>
+ <Compile Include="frmAddMachine.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddMachine.Designer.cs">
+ <DependentUpon>frmAddMachine.cs</DependentUpon>
+ </Compile>
<Compile Include="frmAddTask.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmAddTask.Designer.cs">
<DependentUpon>frmAddTask.cs</DependentUpon>
</Compile>
- <Compile Include="frmMain.cs">
+ <Compile Include="frmain.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="frmMain.Designer.cs">
- <DependentUpon>frmMain.cs</DependentUpon>
+ <Compile Include="frmain.Designer.cs">
+ <DependentUpon>frmain.cs</DependentUpon>
</Compile>
<Compile Include="frmAddItem.cs">
<SubType>Form</SubType>
@@ -126,18 +137,6 @@
</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>
@@ -147,11 +146,17 @@
<EmbeddedResource Include="frmAddRoute.resx">
<DependentUpon>frmAddRoute.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="frmAddRoutName.resx">
+ <DependentUpon>frmAddRoutName.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="frmAddMachine.resx">
+ <DependentUpon>frmAddMachine.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="frmAddTask.resx">
<DependentUpon>frmAddTask.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="frmMain.resx">
- <DependentUpon>frmMain.cs</DependentUpon>
+ <EmbeddedResource Include="frmain.resx">
+ <DependentUpon>frmain.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmAddItem.resx">
<DependentUpon>frmAddItem.cs</DependentUpon>
@@ -184,18 +189,10 @@
<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="ClassDiagram1.cd" />
<None Include="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
+ <Generator>PublicSettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
@@ -240,12 +237,6 @@
<Content Include="picture\确定1.bmp" />
<Content Include="picture\确定2.bmp" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Model\Model.csproj">
- <Project>{274882FC-F42C-4969-9BA1-EE5CBF5C37A0}</Project>
- <Name>Model</Name>
- </ProjectReference>
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Oops, something went wrong.

0 comments on commit 2d1cde1

Please sign in to comment.