From 910d2b0ff3bd2d1d9289088cd1ff0a344c669825 Mon Sep 17 00:00:00 2001
From: PeterForstmeier <peter.forstmeier@t-online.de>
Date: Sat, 3 Sep 2011 16:34:59 +0200
Subject: [PATCH] Style for GridSplitter, apply translation property s

---
 .../CodeQuality/CodeQualityAnalysis.csproj    |  1 +
 .../Resources/GridSplitterTemplate.xaml       |  8 +++
 .../Src/Controls/TreeMatrixControl.xaml       | 10 +--
 .../Analysis/CodeQuality/Src/MainWindow.xaml  | 69 +++++++------------
 .../Src/MainWindowTranslationModel.cs         |  4 +-
 5 files changed, 42 insertions(+), 50 deletions(-)
 create mode 100644 src/AddIns/Analysis/CodeQuality/Resources/GridSplitterTemplate.xaml

diff --git a/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj b/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj
index 865e44896a..54181f47ab 100644
--- a/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj
+++ b/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj
@@ -146,6 +146,7 @@
     <Compile Include="Src\Utility\Matrix.cs" />
     <Compile Include="Src\Utility\RelayCommand.cs" />
     <Compile Include="Src\Utility\ViewModelBase.cs" />
+    <Page Include="Resources\GridSplitterTemplate.xaml" />
     <Page Include="Resources\GraphTemplate.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/AddIns/Analysis/CodeQuality/Resources/GridSplitterTemplate.xaml b/src/AddIns/Analysis/CodeQuality/Resources/GridSplitterTemplate.xaml
new file mode 100644
index 0000000000..c4af171a24
--- /dev/null
+++ b/src/AddIns/Analysis/CodeQuality/Resources/GridSplitterTemplate.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+	<Style x:Key="GridSplitterStyle1" TargetType="{x:Type GridSplitter}">
+		<Setter Property="Background" Value="LightGray"></Setter>
+		<Setter Property="Width" Value="3"></Setter>
+	</Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/AddIns/Analysis/CodeQuality/Src/Controls/TreeMatrixControl.xaml b/src/AddIns/Analysis/CodeQuality/Src/Controls/TreeMatrixControl.xaml
index 618ff83ddd..d5609e190c 100644
--- a/src/AddIns/Analysis/CodeQuality/Src/Controls/TreeMatrixControl.xaml
+++ b/src/AddIns/Analysis/CodeQuality/Src/Controls/TreeMatrixControl.xaml
@@ -42,7 +42,8 @@
 		              Grid.RowSpan="3"
 		              ResizeDirection="Columns"
 		              HorizontalAlignment="Stretch"
-		              VerticalAlignment="Stretch"></GridSplitter>
+		              VerticalAlignment="Stretch"
+		              Style="{DynamicResource GridSplitterStyle1}"></GridSplitter>
 		
 		<tree:SharpTreeView
 			Name="topTree"
@@ -54,12 +55,11 @@
 			</tree:SharpTreeView.LayoutTransform>
 		</tree:SharpTreeView>
 		
-		<GridSplitter Grid.Row="1"
-		              Grid.Column="2"
+		<GridSplitter Grid.Row="1" Grid.Column="2"		             
 		              Height="3"
 		              ResizeDirection="Rows"
-		              HorizontalAlignment="Stretch"></GridSplitter>
-		
+		              HorizontalAlignment="Stretch"		
+					Background="LightGray"></GridSplitter>		
 		<ScrollViewer
 			Grid.Column="2"
 			Grid.Row="2"
diff --git a/src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml b/src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml
index 91b54d206b..ae112c0b37 100644
--- a/src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml
+++ b/src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml
@@ -25,42 +25,8 @@ DataContext="{Binding RelativeSource={RelativeSource Self}}"
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="../Resources/GraphTemplate.xaml" />
+			<ResourceDictionary Source="../Resources/GridSplitterTemplate.xaml" />
 			</ResourceDictionary.MergedDictionaries>
-			<!--
-			<DataTemplate x:Key="MemberTemplate">
-				<StackPanel Orientation="Horizontal">
-					<Image Source="{Binding Path=Icon}" Margin="0, 0, 5, 0" />
-					<TextBlock Text="{Binding Path=Name}" />
-				</StackPanel>
-			</DataTemplate>
-			
-			<HierarchicalDataTemplate x:Key="TypeTemplate"
-				ItemTemplate="{StaticResource MemberTemplate}"
-				ItemsSource="{Binding Members}">
-				<StackPanel Orientation="Horizontal">
-					<Image Source="{Binding Path=Icon}"  Margin="0, 0, 5, 0" />
-					<TextBlock Text="{Binding Path=Name}" />
-				</StackPanel>
-			</HierarchicalDataTemplate>
-			
-			<HierarchicalDataTemplate x:Key="NamespaceTemplate"
-				ItemsSource="{Binding Types}"
-				ItemTemplate="{StaticResource TypeTemplate}">
-				<StackPanel Orientation="Horizontal">
-					<Image Source="{Binding Path=Icon}"  Margin="0, 0, 5, 0" />
-					<TextBlock Text="{Binding Path=Name}" />
-				</StackPanel>
-			</HierarchicalDataTemplate>
-			
-			<HierarchicalDataTemplate ItemsSource="{Binding Namespaces}"
-				ItemTemplate="{StaticResource NamespaceTemplate}"
-				x:Key="ModuleTemplate">
-				<StackPanel Orientation="Horizontal">
-					<Image Source="{Binding Path=Icon}"  Margin="0, 0, 5, 0" />
-					<TextBlock Text="{Binding Path=Name}" />
-				</StackPanel>
-			</HierarchicalDataTemplate>
--->
 		</ResourceDictionary>
 	</Window.Resources>
 	
@@ -73,19 +39,15 @@ DataContext="{Binding RelativeSource={RelativeSource Self}}"
 		
 		<ToolBarTray Background="White" Grid.Row="0">
 			<ToolBar>
-				
 				<Button Name="btnOpenAssembly"
 				        Content="{Binding OpenAssembly}"
 				        Click="btnOpenAssembly_Click" 
 				        Margin="0 0 5 0"></Button>
-<!--
-			<Button Command="{Binding Path=OpenAssemblyCommand}" Margin="0 0 5 0">Open Assembly</Button>
-			 -->       
 			</ToolBar>
 		</ToolBarTray>
 			
 		<TabControl Grid.Row="1" Name="mainTabs" IsEnabled="False"> <!-- It is enabled once assembly is loaded. -->
-			<TabItem Header="Dependency Graph">
+			<TabItem Header="{Binding DependencyGraph}">
 				<Grid>
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
@@ -94,11 +56,13 @@ DataContext="{Binding RelativeSource={RelativeSource Self}}"
 					
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="250px" />
+						<ColumnDefinition Width="3"></ColumnDefinition>
 						<ColumnDefinition />
+						<ColumnDefinition Width="3"></ColumnDefinition>
 						<ColumnDefinition Width="200px" />
 					</Grid.ColumnDefinitions>
 					
-					<ToolBarTray Background="White" Grid.Row="0" Grid.ColumnSpan="2">
+					<ToolBarTray Background="White" Grid.Row="0" Grid.ColumnSpan="3">
 						<ToolBar>
 							<Button Name="btnRelayout" Click="btnRelayout_Click" Margin="0 0 5 0">Relayout</Button>
 							<Button Name="btnContinueLayout" Click="btnContinueLayout_Click" Margin="0 0 5 0">Continue Layout</Button>
@@ -110,11 +74,19 @@ DataContext="{Binding RelativeSource={RelativeSource Self}}"
 					
 					<tree:SharpTreeView Name="definitionTree"
 						Grid.Row="1" Grid.Column="0"
+						Margin="2"
 						SelectionChanged="definitionTree_SelectedItemChanged">
 					</tree:SharpTreeView>
-
 					
-					<Controls:ZoomControl Grid.Row="1" Grid.Column="1" Name="zoom" AlwaysShowZoomButtons="True" HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible">
+					<GridSplitter Grid.Column="1"
+					              Grid.Row="1"					             
+					              Grid.RowSpan="2"
+					              ResizeDirection="Columns"
+					              HorizontalAlignment="Stretch"
+					              VerticalAlignment="Stretch"
+								  Style="{DynamicResource GridSplitterStyle1}"></GridSplitter>
+
+					<Controls:ZoomControl Grid.Row="1" Grid.Column="2" Name="zoom" AlwaysShowZoomButtons="True" HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible">
 						<Graph:DependencyGraphLayout x:Name="graphLayout"
 							LayoutAlgorithmType="LinLog"
 							OverlapRemovalAlgorithmType="FSA"
@@ -123,7 +95,16 @@ DataContext="{Binding RelativeSource={RelativeSource Self}}"
 						/>
 					</Controls:ZoomControl>
 					
-					<TextBlock Name="txbTypeInfo" Grid.Column="3" Grid.Row="1"/>
+					<GridSplitter Grid.Column="3"
+					              Grid.RowSpan="2"
+					              ResizeDirection="Columns"
+					              HorizontalAlignment="Stretch"
+					              VerticalAlignment="Stretch"
+					 			Style="{DynamicResource GridSplitterStyle1}"></GridSplitter>
+					
+					<TextBlock Name="txbTypeInfo"
+					           Margin="2"
+					           Grid.Column="4"  Grid.RowSpan="2" Padding="5" Background="LightBlue"/>
 				</Grid>
 			</TabItem>
 			<TabItem Header="Dependency Matrix">
diff --git a/src/AddIns/Analysis/CodeQuality/Src/MainWindowTranslationModel.cs b/src/AddIns/Analysis/CodeQuality/Src/MainWindowTranslationModel.cs
index 7ce07dab61..225fe47e91 100644
--- a/src/AddIns/Analysis/CodeQuality/Src/MainWindowTranslationModel.cs
+++ b/src/AddIns/Analysis/CodeQuality/Src/MainWindowTranslationModel.cs
@@ -26,13 +26,15 @@ namespace ICSharpCode.CodeQualityAnalysis
 		public MainWindowTranslationViewModel():base()
 		{
 			this.Title = "Code Quality Analysis";
-			this.OpenAssembly = "OpenAssembly";
+			this.OpenAssembly = "Open Assembly";
+			this.DependencyGraph = "Dependency Graph";
 		}
 		
 		public string Title {get;private set;}
 		
 		public string OpenAssembly {get; private set;}
 		
+		public string DependencyGraph {get; private set;}
 		
 		#region OpenAssembly
 		/*