changes

Author: Sergey-Dvortsov

Terminal/Terminal/App.xaml

@@ -1,14 +1,8 @@
-<sx:ExtendedBaseApplication
-			x:Class="Terminal.App"
+<Application x:Class="Terminal.App"
 			xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			Startup="App_Startup" 
 			xmlns:sx="http://schemas.stocksharp.com/xaml">
     <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="TemplateDictionary.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
     </Application.Resources>
-</sx:ExtendedBaseApplication>
+</Application>

Terminal/Terminal/App.xaml.cs

@@ -25,9 +25,8 @@ private void App_Startup(object sender, StartupEventArgs e)
 
             try
             {
-                Root.GetInstance();
                 var mnd = new MainWindow();
-                this.MainWindow = mnd;
+                MainWindow = mnd;
                 this.MainWindow.Show();
             }
             catch (Exception ex)

Terminal/Terminal/Common/DockSiteViewModelBehavior.cs

@@ -1,9 +1,44 @@
 <Window x:Class="Terminal.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Height="600" Width="800">
-    <DockPanel LastChildFill="True">
-        <ContentControl Content="{Binding}" />
-    </DockPanel>
+		xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+		xmlns:docking="clr-namespace:ActiproSoftware.Windows.Controls.Docking;assembly=ActiproSoftware.Docking.Wpf"
+		xmlns:loc="clr-namespace:StockSharp.Localization;assembly=StockSharp.Localization"
+		DataContext="{Binding RelativeSource={RelativeSource Self}}"
+		Height="600" Width="800">
+    <Window.Resources>
+
+        <Style x:Key="DockingItemStyle" TargetType="docking:DockingWindow">
+            <!--<Setter Property="ImageSource" Value="{Binding ImageSource}" />-->
+            <Setter Property="Title" Value="{Binding Title}" />
+        </Style>
+
+        <Style x:Key="ToolItemStyle" TargetType="docking:ToolWindow" BasedOn="{StaticResource DockingItemStyle}" />
+
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="25" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <ToolBar>
+            <Button x:Name="ConnectButton" 
+					Content="{x:Static loc:LocalizedStrings.Connect}"
+					Command="{Binding RelativeSource={RelativeSource AncestorType=Window}, Path=DataContext.ConnectCommand}" />
+        </ToolBar>
+
+        <docking:DockSite x:Name="DockSite" Grid.Row="1" 
+			ToolItemsSource="{Binding RelativeSource={RelativeSource AncestorType=Window}, Path=DataContext.ToolItems}"
+			ToolItemContainerStyle="{StaticResource ToolItemStyle}" 
+			Loaded="DockSite_OnLoaded" 
+			WindowClosed="DockSite_OnWindowClosed">
+            <docking:Workspace>
+                <docking:TabbedMdiHost>
+                    <docking:TabbedMdiContainer/>
+                </docking:TabbedMdiHost>
+            </docking:Workspace>
+        </docking:DockSite>
+    </Grid>
 </Window>
 
+
+