Skip to content

Commit

Permalink
StockSharp#168 refactoring.
Browse files Browse the repository at this point in the history
  • Loading branch information
mikasoukhov committed Sep 8, 2015
1 parent 2815409 commit bb8d8e8
Show file tree
Hide file tree
Showing 10 changed files with 366 additions and 210 deletions.
100 changes: 62 additions & 38 deletions Anywhere/Anywhere/Anywhere.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{BDDB57FB-3404-48C8-B730-94B0957BBBD8}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Anywhere</RootNamespace>
<RootNamespace>StockSharp.Anywhere</RootNamespace>
<AssemblyName>Anywhere</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand All @@ -34,68 +34,49 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>..\..\References\stocksharp.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="ActiproSoftware.Docking.Wpf, Version=11.2.555.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\ActiproSoftware.Docking.Wpf.dll</HintPath>
<HintPath>..\..\References\Actipro\ActiproSoftware.Docking.Wpf.dll</HintPath>
</Reference>
<Reference Include="ActiproSoftware.Shared.Wpf, Version=11.2.555.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\References\Actipro\ActiproSoftware.Shared.Wpf.dll</HintPath>
</Reference>
<Reference Include="Ecng.Collections">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\Ecng.Collections.dll</HintPath>
<HintPath>..\..\References\Ecng\Ecng.Collections.dll</HintPath>
</Reference>
<Reference Include="Ecng.Common">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\Ecng.Common.dll</HintPath>
<HintPath>..\..\References\Ecng\Ecng.Common.dll</HintPath>
</Reference>
<Reference Include="Ecng.ComponentModel">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\Ecng.ComponentModel.dll</HintPath>
</Reference>
<Reference Include="Ecng.Localization">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\Ecng.Localization.dll</HintPath>
<HintPath>..\..\References\Ecng\Ecng.ComponentModel.dll</HintPath>
</Reference>
<Reference Include="Ecng.Serialization">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\Ecng.Serialization.dll</HintPath>
<HintPath>..\..\References\Ecng\Ecng.Serialization.dll</HintPath>
</Reference>
<Reference Include="Ecng.Xaml">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\Ecng.Xaml.dll</HintPath>
<HintPath>..\..\References\Ecng\Ecng.Xaml.dll</HintPath>
</Reference>
<Reference Include="MoreLinq">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\MoreLinq.dll</HintPath>
</Reference>
<Reference Include="StockSharp.Algo">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\StockSharp.Algo.dll</HintPath>
</Reference>
<Reference Include="StockSharp.BusinessEntities">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\StockSharp.BusinessEntities.dll</HintPath>
</Reference>
<Reference Include="StockSharp.Localization">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\StockSharp.Localization.dll</HintPath>
</Reference>
<Reference Include="StockSharp.Logging">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\StockSharp.Logging.dll</HintPath>
</Reference>
<Reference Include="StockSharp.Messages">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\StockSharp.Messages.dll</HintPath>
</Reference>
<Reference Include="StockSharp.Quik">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\StockSharp.Quik.dll</HintPath>
</Reference>
<Reference Include="StockSharp.Xaml">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp_4.3.10\References\StockSharp.Xaml.dll</HintPath>
<HintPath>..\..\References\Ecng\MoreLinq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.XML" />
<Reference Include="System.Xml.Linq" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.Toolkit">
<HintPath>..\..\..\..\Documents\StockSharp\StockSharp-4.3.10\References\Ecng\Xceed.Wpf.Toolkit.dll</HintPath>
<HintPath>..\..\References\Ecng\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -107,6 +88,9 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="..\..\StockSharpAssemblyInfo.cs">
<Link>Properties\StockSharpAssemblyInfo.cs</Link>
</Compile>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
Expand All @@ -130,6 +114,7 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
Expand All @@ -143,6 +128,45 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Resource Include="..\..\References\stocksharp.ico">
<Link>Properties\stocksharp.ico</Link>
</Resource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\StockSharp %28GitLab%29\Xaml.Charting\Xaml.Charting.csproj">
<Project>{c449d618-dea4-41c3-ba86-9f827c7421dc}</Project>
<Name>Xaml.Charting</Name>
</ProjectReference>
<ProjectReference Include="..\..\Algo\Algo.csproj">
<Project>{2a5c6fad-106c-4a4a-b602-77a6b1034ca2}</Project>
<Name>Algo</Name>
</ProjectReference>
<ProjectReference Include="..\..\BusinessEntities\BusinessEntities.csproj">
<Project>{dce69db8-53ca-4b7f-9368-02f175a31074}</Project>
<Name>BusinessEntities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Connectors\Quik\Quik.csproj">
<Project>{1b798a4e-2271-46f9-9c2d-4e563114e268}</Project>
<Name>Quik</Name>
</ProjectReference>
<ProjectReference Include="..\..\Localization\Localization.csproj">
<Project>{a98a81ce-75a1-4fab-9c02-e6eef4b51f4f}</Project>
<Name>Localization</Name>
</ProjectReference>
<ProjectReference Include="..\..\Logging\Logging.csproj">
<Project>{c4476add-a3d5-41bb-9d43-55d865863b78}</Project>
<Name>Logging</Name>
</ProjectReference>
<ProjectReference Include="..\..\Messages\Messages.csproj">
<Project>{b47f9c23-a4bd-46a9-bf27-54cb3d653503}</Project>
<Name>Messages</Name>
</ProjectReference>
<ProjectReference Include="..\..\Xaml\Xaml.csproj">
<Project>{64e4d6f0-36b6-4904-9ba7-fffbe5ff71d8}</Project>
<Name>Xaml</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.
Expand Down
178 changes: 178 additions & 0 deletions Anywhere/Anywhere/AnywherePublic.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{BDDB57FB-3404-48C8-B730-94B0957BBBD8}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>StockSharp.Anywhere</RootNamespace>
<AssemblyName>Anywhere</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>..\..\References\stocksharp.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="ActiproSoftware.Docking.Wpf, Version=11.2.555.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\References\Actipro\ActiproSoftware.Docking.Wpf.dll</HintPath>
</Reference>
<Reference Include="ActiproSoftware.Shared.Wpf, Version=11.2.555.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\References\Actipro\ActiproSoftware.Shared.Wpf.dll</HintPath>
</Reference>
<Reference Include="Ecng.Collections">
<HintPath>..\..\References\Ecng\Ecng.Collections.dll</HintPath>
</Reference>
<Reference Include="Ecng.Common">
<HintPath>..\..\References\Ecng\Ecng.Common.dll</HintPath>
</Reference>
<Reference Include="Ecng.ComponentModel">
<HintPath>..\..\References\Ecng\Ecng.ComponentModel.dll</HintPath>
</Reference>
<Reference Include="Ecng.Serialization">
<HintPath>..\..\References\Ecng\Ecng.Serialization.dll</HintPath>
</Reference>
<Reference Include="Ecng.Xaml">
<HintPath>..\..\References\Ecng\Ecng.Xaml.dll</HintPath>
</Reference>
<Reference Include="MoreLinq">
<HintPath>..\..\References\Ecng\MoreLinq.dll</HintPath>
</Reference>
<Reference Include="StockSharp.Xaml.Charting, Version=4.3.10.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Xaml.Charting\StockSharp.Xaml.Charting.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.XML" />
<Reference Include="System.Xml.Linq" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.Toolkit">
<HintPath>..\..\References\Ecng\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="..\..\StockSharpAssemblyInfo.cs">
<Link>Properties\StockSharpAssemblyInfo.cs</Link>
</Compile>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Resource Include="..\..\References\stocksharp.ico">
<Link>Properties\stocksharp.ico</Link>
</Resource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Algo\Algo.csproj">
<Project>{2a5c6fad-106c-4a4a-b602-77a6b1034ca2}</Project>
<Name>Algo</Name>
</ProjectReference>
<ProjectReference Include="..\..\BusinessEntities\BusinessEntities.csproj">
<Project>{dce69db8-53ca-4b7f-9368-02f175a31074}</Project>
<Name>BusinessEntities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Connectors\Quik\Quik.csproj">
<Project>{1b798a4e-2271-46f9-9c2d-4e563114e268}</Project>
<Name>Quik</Name>
</ProjectReference>
<ProjectReference Include="..\..\Localization\Localization.csproj">
<Project>{a98a81ce-75a1-4fab-9c02-e6eef4b51f4f}</Project>
<Name>Localization</Name>
</ProjectReference>
<ProjectReference Include="..\..\Logging\Logging.csproj">
<Project>{c4476add-a3d5-41bb-9d43-55d865863b78}</Project>
<Name>Logging</Name>
</ProjectReference>
<ProjectReference Include="..\..\Messages\Messages.csproj">
<Project>{b47f9c23-a4bd-46a9-bf27-54cb3d653503}</Project>
<Name>Messages</Name>
</ProjectReference>
<ProjectReference Include="..\..\Xaml\Xaml.csproj">
<Project>{64e4d6f0-36b6-4904-9ba7-fffbe5ff71d8}</Project>
<Name>Xaml</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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
13 changes: 7 additions & 6 deletions Anywhere/Anywhere/App.xaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Application x:Class="Anywhere.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml">
<sx:ExtendedBaseApplication
x:Class="StockSharp.Anywhere.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml" ShutdownMode="OnExplicitShutdown"
xmlns:sx="http://schemas.stocksharp.com/xaml">
<Application.Resources>

</Application.Resources>
</Application>
</sx:ExtendedBaseApplication>
17 changes: 3 additions & 14 deletions Anywhere/Anywhere/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;

namespace Anywhere
namespace StockSharp.Anywhere
{
/// <summary>
/// Логика взаимодействия для App.xaml
/// </summary>
public partial class App : Application
public partial class App
{
}
}
}
4 changes: 2 additions & 2 deletions Anywhere/Anywhere/MainWindow.xaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Window x:Class="Anywhere.MainWindow"
<Window x:Class="StockSharp.Anywhere.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:loc="clr-namespace:StockSharp.Localization;assembly=StockSharp.Localization"
xmlns:sx="http://schemas.stocksharp.com/xaml"
xmlns:docking="clr-namespace:ActiproSoftware.Windows.Controls.Docking;assembly=ActiproSoftware.Docking.Wpf"
xmlns:ug="clr-namespace:Ecng.Xaml.Grids;assembly=Ecng.Xaml"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
Title="S#.Broker" Height="600" Width="800"
Title="S#.Anywhere" Height="600" Width="800"
DataContext="{Binding RelativeSource={RelativeSource Self}}">
<Grid>
<Grid.RowDefinitions>
Expand Down
Loading

0 comments on commit bb8d8e8

Please sign in to comment.