Improved UI, release v0.8.0

RicoSuter · Aug 24, 2015 · 4a496ca · 4a496ca
1 parent 3f622fb
commit 4a496ca
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 43 deletions.
diff --git a/src/ProjectDependencyBrowser.Installer/Generated.wxs b/src/ProjectDependencyBrowser.Installer/Generated.wxs
@@ -392,15 +392,9 @@
             <Component Id="cmpCED5B7488C31D594E13DDD9CAB74BFD8" Directory="RootDirectory" Guid="*">
                 <File Id="fil29681523F6C5F6494E9C0C2613364952" KeyPath="yes" Source="$(var.SourcePath)\MyToolkit.Extended.dll" />
             </Component>
-            <Component Id="cmp3A914B6C87AC51BB09822FF34BA4B612" Directory="RootDirectory" Guid="*">
-                <File Id="filB6ADD1F869C4BB9DB47E45E785EFC062" KeyPath="yes" Source="$(var.SourcePath)\MyToolkit.Extended.pdb" />
-            </Component>
             <Component Id="cmp5DA04D879E472CDB59610C78E2C06D67" Directory="RootDirectory" Guid="*">
                 <File Id="fil9DE1E33FF998D56AD5CDDBB114A9D14E" KeyPath="yes" Source="$(var.SourcePath)\MyToolkit.Extended.xml" />
             </Component>
-            <Component Id="cmp26462F562C414B4105A6C02B787B44E3" Directory="RootDirectory" Guid="*">
-                <File Id="filD0D967A880C1A24B91AB2210161ED9CA" KeyPath="yes" Source="$(var.SourcePath)\MyToolkit.pdb" />
-            </Component>
             <Component Id="cmp31D065AFFB2F9C455FBCDC62BD6A0282" Directory="RootDirectory" Guid="*">
                 <File Id="fil2E9070A107598B8FB198EFBCF6062E75" KeyPath="yes" Source="$(var.SourcePath)\MyToolkit.xml" />
             </Component>

diff --git a/src/ProjectDependencyBrowser/App.xaml b/src/ProjectDependencyBrowser/App.xaml
@@ -3,5 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
+        <Style x:Key="SelectableTextBlock" TargetType="TextBox">
+            <Setter Property="Padding" Value="-1" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="IsReadOnly" Value="True" />
+        </Style>
     </Application.Resources>
 </Application>
diff --git a/src/ProjectDependencyBrowser/Properties/AssemblyInfo.cs b/src/ProjectDependencyBrowser/Properties/AssemblyInfo.cs
@@ -25,4 +25,4 @@
     ResourceDictionaryLocation.SourceAssembly 
 )]
 
-[assembly: AssemblyVersion("0.7.*")]
+[assembly: AssemblyVersion("0.8.*")]
diff --git a/src/ProjectDependencyBrowser/Views/MainWindow.xaml b/src/ProjectDependencyBrowser/Views/MainWindow.xaml
@@ -261,7 +261,7 @@
             <TabItem Header="About">
                 <StackPanel Margin="8">
                     <TextBlock Margin="0,0,0,8" FontSize="14">
-                        <Hyperlink NavigateUri="http://projectdependencybrowser.codeplex.com" Click="OnOpenHyperlink">Project Dependency Browser</Hyperlink>
+                        <Hyperlink NavigateUri="http://projectdependencybrowser.org" Click="OnOpenHyperlink">Project Dependency Browser</Hyperlink>
                         has been developed by 
                         <Hyperlink NavigateUri="http://www.rsuter.com" Click="OnOpenHyperlink">Rico Suter</Hyperlink>.
                     </TextBlock>
@@ -284,7 +284,8 @@
                    Visibility="{Binding IsLoaded, Converter={StaticResource NotConverter}}" />
         <Grid Grid.Row="2" Visibility="{Binding IsLoaded, Converter={StaticResource VisibilityConverter}}">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" MaxWidth="350" />
+                <ColumnDefinition Width="350" MinWidth="250" MaxWidth="550" />
+                <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
@@ -308,14 +309,20 @@
                          ItemTemplate="{StaticResource ProjectReferenceTemplate}" />
             </Grid>
 
+            <GridSplitter Grid.Column="1" Width="8" ResizeBehavior="PreviousAndNext" />
+
             <!-- Selected project -->
-            <Grid Grid.Column="1" Margin="8,0,0,0" Visibility="{Binding SelectedProject, Converter={StaticResource VisibilityConverter}}">
+            <Grid Grid.Column="2" Visibility="{Binding SelectedProject, Converter={StaticResource VisibilityConverter}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
-                <TextBlock Text="Project" FontWeight="Bold" Margin="0,0,0,4" />
+                <StackPanel>
+                    <TextBlock Text="Project" FontWeight="Bold" Margin="0,0,0,4" />
+                </StackPanel>
+
                 <TabControl Grid.Row="1">
                     <!-- Tab: Overview -->
                     <TabItem Header="Overview">
@@ -326,32 +333,14 @@
                             </Grid.RowDefinitions>
 
                             <StackPanel Grid.Row="0">
-                                <Grid Margin="0,0,0,8">
-                                    <StackPanel>
-                                        <TextBlock Text="Name: " FontWeight="Bold" Margin="0,0,0,4" />
-                                        <TextBlock Text="{Binding SelectedProject.Name}" />
-                                    </StackPanel>
-
-                                    <StackPanel Orientation="Horizontal"
-                                                HorizontalAlignment="Right" VerticalAlignment="Top" 
-                                                Grid.Column="0">
-                                        <Button Content="Open project directory" 
-                                                Command="{Binding OpenProjectDirectoryCommand}"
-                                                CommandParameter="{Binding SelectedProject}" 
-                                                Padding="8,4,8,4" />
-
-                                        <Button Content="Project details" Padding="8,4,8,4" Margin="8,0,0,0"
-                                                x:Name="ProjectDetailsButton"
-                                                Command="{Binding ShowProjectDetailsCommand}"
-                                                CommandParameter="{Binding SelectedProject}" />
-                                    </StackPanel>
-                                </Grid>
+                                <TextBlock Text="Name: " FontWeight="Bold" Margin="0,0,0,4" />
+                                <TextBox Text="{Binding SelectedProject.Name, Mode=OneWay}" Margin="0,0,0,8" Style="{StaticResource SelectableTextBlock}" />
 
                                 <TextBlock Text="Namespace: " FontWeight="Bold" Margin="0,0,0,4" />
-                                <TextBlock Text="{Binding SelectedProject.Namespace}" Margin="0,0,0,8" />
+                                <TextBox Text="{Binding SelectedProject.Namespace, Mode=OneWay}" Margin="0,0,0,8" Style="{StaticResource SelectableTextBlock}" />
 
                                 <TextBlock Text="Path: " FontWeight="Bold" Margin="0,0,0,4" />
-                                <TextBlock Text="{Binding SelectedProject.Path}" Margin="0,0,0,8" />
+                                <TextBox Text="{Binding SelectedProject.Path, Mode=OneWay}" Margin="0,0,0,8" Style="{StaticResource SelectableTextBlock}" />
 
                                 <StackPanel Visibility="{Binding SelectedProject.ProjectTypes, Converter={StaticResource VisibilityConverter}}">
                                     <TextBlock Text="Project type: " FontWeight="Bold" Margin="0,0,0,4" />
@@ -379,9 +368,11 @@
                     <TabItem Header="References">
                         <Grid Margin="8">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="30*" />
-                                <ColumnDefinition Width="30*" />
-                                <ColumnDefinition Width="40*" />
+                                <ColumnDefinition Width="30*" MinWidth="160" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="30*" MinWidth="160" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="40*" MinWidth="160" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
@@ -393,28 +384,36 @@
                                        Text="Referenced projects: " FontWeight="Bold" Margin="0,0,0,4" />
                             <controls:FilterListBox x:Name="ProjectReferencesList" 
                                                     Grid.Row="1" Grid.Column="0" 
-                                                    Margin="0,0,4,0"                                      
+                                                    Margin="0,0,4,0"
                                                     MouseDoubleClick="OnProjectDoubleClicked"
                                                     KeyUp="OnProjectKeyUp" FilterPath="Name"
                                                     HorizontalContentAlignment="Stretch"
                                                     ItemTemplate="{StaticResource ProjectReferenceTemplate}"
                                                     ItemsSource="{Binding SelectedProject.ProjectReferences}" />
 
+                            <GridSplitter Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Width="4" ResizeBehavior="PreviousAndNext" />
+
                             <!-- NuGet projects -->
-                            <TextBlock Grid.Row="0" Grid.Column="1" 
+                            <TextBlock Grid.Row="0" Grid.Column="2" 
                                        Text="NuGet packages: " FontWeight="Bold" Margin="4,0,0,4" />
                             <controls:FilterListBox x:Name="NuGetReferencesList" 
-                                                    Grid.Row="1" Grid.Column="1" Margin="4,0,4,0" 
-                                                    HorizontalContentAlignment="Stretch" FilterPath="Name"
+                                                    Grid.Row="1" Grid.Column="2" 
+                                                    Margin="4,0,4,0"
+                                                    HorizontalContentAlignment="Stretch" 
+                                                    FilterPath="Name"
                                                     ItemTemplate="{StaticResource NuGetPackageTemplate}"
                                                     ItemsSource="{Binding SelectedProject.NuGetReferences}" />
 
+                            <GridSplitter Grid.Column="3" Grid.Row="0" Grid.RowSpan="2" Width="4" ResizeBehavior="PreviousAndNext" />
+
                             <!-- Referenced assemblies -->
-                            <TextBlock Grid.Row="0" Grid.Column="2" 
+                            <TextBlock Grid.Row="0" Grid.Column="4" 
                                        Text="Referenced assemblies: " FontWeight="Bold" Margin="4,0,0,0" />
                             <controls:FilterListBox x:Name="AssemblyReferencesList" 
-                                                    Grid.Row="1" Grid.Column="2" Margin="4,0,0,0" 
-                                                    HorizontalContentAlignment="Stretch" FilterPath="Name"
+                                                    Grid.Row="1" Grid.Column="4" 
+                                                    Margin="4,0,0,0"
+                                                    HorizontalContentAlignment="Stretch" 
+                                                    FilterPath="Name"
                                                     ItemTemplate="{StaticResource AssemblyReferenceTemplate}"
                                                     ItemsSource="{Binding SelectedProject.AssemblyReferences}" />
                         </Grid>
@@ -438,6 +437,17 @@
                         </Grid>
                     </TabItem>
                 </TabControl>
+
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,8,0,0" Grid.Row="2">
+                    <Button Content="Open project directory" 
+                                Command="{Binding OpenProjectDirectoryCommand}"
+                                CommandParameter="{Binding SelectedProject}" 
+                                Padding="8,4,8,4" />
+                    <Button Content="Project details" Padding="8,4,8,4" Margin="8,0,0,0"
+                                x:Name="ProjectDetailsButton"
+                                Command="{Binding ShowProjectDetailsCommand}"
+                                CommandParameter="{Binding SelectedProject}" />
+                </StackPanel>
             </Grid>
         </Grid>
     </Grid>