Merge lp:~mandel/ubuntuone-windows-installer/make_preferences_dialog_attractive into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Made the preferences dialog "preaty"

[John Lenton (chipaca)]

review: Approve

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-11-15 14:14:17 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-11-15 14:14:17 +0000
@@ -238,6 +238,12 @@
     <Resource Include="Resources\icon_spin_09.png" />
     <Resource Include="Resources\icon_spin_10.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\tab_cloud.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\title_logo.png" />
+  </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.

=== modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml'
--- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml	2010-11-15 14:14:17 +0000
+++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml	2010-11-15 14:14:17 +0000
@@ -23,6 +23,64 @@
     xmlns:Views="clr-namespace:Canonical.UbuntuOne.Client.Views" 
     xmlns:resx="clr-namespace:Canonical.UbuntuOne.Client.Views.Resources"
     Title="{x:Static resx:Resources.PreferencesDialogTitle}" Height="450" Width="400" ResizeMode="NoResize">
+    <Window.Resources>
+        <Style TargetType="{x:Type TabItem}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TabItem}">
+                        <Grid>
+                            <Border Name="Border"
+                                    Background="White"
+                                    BorderBrush="DarkGray"
+                                    BorderThickness="1,1,1,1" 
+                                    CornerRadius="6,6,0,0" >
+                                <ContentPresenter x:Name="ContentSite"
+                                                  VerticalAlignment="Center"
+                                                  HorizontalAlignment="Center"
+                                                  ContentSource="Header"
+                                                  Margin="12,2,12,2"/>
+                            </Border>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter TargetName="Border" Property="Background" Value="White" />
+                            </Trigger>
+                            <Trigger Property="IsSelected" Value="False">
+                                <Setter TargetName="Border" Property="Background" Value="LightGray" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style  TargetType="{x:Type TabControl}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TabControl}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <TabPanel Grid.Row="0"
+                                      Panel.ZIndex="1" 
+                                      Margin="0,0,4,-1" 
+                                      IsItemsHost="True"
+                                      Background="Transparent" />
+                            <Border Grid.Row="1"
+                                    BorderBrush="DarkGray"
+                                    BorderThickness="1"  >
+                                <Border.Background>
+                                    <ImageBrush ImageSource="/Canonical.UbuntuOne.Client.Views;component/Resources/tab_cloud.png" Stretch="None" AlignmentX="Right" AlignmentY="Top"/>
+                                </Border.Background>
+                                <ContentPresenter ContentSource="SelectedContent" />
+                            </Border>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
     <Grid Margin="3">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
@@ -30,6 +88,11 @@
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="81" />
+            </Grid.ColumnDefinitions>
+            <Grid Grid.Column="0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
@@ -39,11 +102,13 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <ProgressBar Name="ConsumptionProgressbar" Grid.Column="0" HorizontalAlignment="Stretch" Margin="3" Minimum="0" Maximum="100"/>
+                <ProgressBar Name="ConsumptionProgressbar" Grid.Column="0" HorizontalAlignment="Stretch" Margin="3" Minimum="0" Maximum="100" Value="40"/>
                 <Label Name="ConsumptionLabel" Grid.Column="1">Unknown</Label>
             </Grid>
             <Label Name="StatusLabel" Grid.Row="1">Disconnected</Label>
         </Grid>
+            <Image Source="/Canonical.UbuntuOne.Client.Views;component/Resources/title_logo.png" Grid.Column="1"/>
+        </Grid>
         <TabControl Margin="3" Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogAccountTabHeader}" >
                 <Views:AccountView x:Name="AccountsTab" Height="300" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>

=== added file 'src/Canonical.UbuntuOne.Client.Views/Resources/tab_cloud.png'
Binary files src/Canonical.UbuntuOne.Client.Views/Resources/tab_cloud.png	1970-01-01 00:00:00 +0000 and src/Canonical.UbuntuOne.Client.Views/Resources/tab_cloud.png	2010-11-15 14:14:17 +0000 differ
=== added file 'src/Canonical.UbuntuOne.Client.Views/Resources/title_logo.png'
Binary files src/Canonical.UbuntuOne.Client.Views/Resources/title_logo.png	1970-01-01 00:00:00 +0000 and src/Canonical.UbuntuOne.Client.Views/Resources/title_logo.png	2010-11-15 14:14:17 +0000 differ