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

Proposed by Manuel de la Peña
Status: Merged
Approved by: John Lenton
Approved revision: 181
Merged at revision: 140
Proposed branch: lp:~mandel/ubuntuone-windows-installer/make_preferences_dialog_attractive
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/add_account_information
Diff against target: 117 lines (+72/-1)
2 files modified
src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj (+6/-0)
src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml (+66/-1)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/make_preferences_dialog_attractive
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+40869@code.launchpad.net

Description of the change

Made the preferences dialog "preaty"

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
2--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj 2010-11-15 14:14:17 +0000
3+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj 2010-11-15 14:14:17 +0000
4@@ -238,6 +238,12 @@
5 <Resource Include="Resources\icon_spin_09.png" />
6 <Resource Include="Resources\icon_spin_10.png" />
7 </ItemGroup>
8+ <ItemGroup>
9+ <Resource Include="Resources\tab_cloud.png" />
10+ </ItemGroup>
11+ <ItemGroup>
12+ <Resource Include="Resources\title_logo.png" />
13+ </ItemGroup>
14 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
15 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
16 Other similar extension points exist, see Microsoft.Common.targets.
17
18=== modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml'
19--- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml 2010-11-15 14:14:17 +0000
20+++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml 2010-11-15 14:14:17 +0000
21@@ -23,6 +23,64 @@
22 xmlns:Views="clr-namespace:Canonical.UbuntuOne.Client.Views"
23 xmlns:resx="clr-namespace:Canonical.UbuntuOne.Client.Views.Resources"
24 Title="{x:Static resx:Resources.PreferencesDialogTitle}" Height="450" Width="400" ResizeMode="NoResize">
25+ <Window.Resources>
26+ <Style TargetType="{x:Type TabItem}">
27+ <Setter Property="Template">
28+ <Setter.Value>
29+ <ControlTemplate TargetType="{x:Type TabItem}">
30+ <Grid>
31+ <Border Name="Border"
32+ Background="White"
33+ BorderBrush="DarkGray"
34+ BorderThickness="1,1,1,1"
35+ CornerRadius="6,6,0,0" >
36+ <ContentPresenter x:Name="ContentSite"
37+ VerticalAlignment="Center"
38+ HorizontalAlignment="Center"
39+ ContentSource="Header"
40+ Margin="12,2,12,2"/>
41+ </Border>
42+ </Grid>
43+ <ControlTemplate.Triggers>
44+ <Trigger Property="IsSelected" Value="True">
45+ <Setter TargetName="Border" Property="Background" Value="White" />
46+ </Trigger>
47+ <Trigger Property="IsSelected" Value="False">
48+ <Setter TargetName="Border" Property="Background" Value="LightGray" />
49+ </Trigger>
50+ </ControlTemplate.Triggers>
51+ </ControlTemplate>
52+ </Setter.Value>
53+ </Setter>
54+ </Style>
55+ <Style TargetType="{x:Type TabControl}">
56+ <Setter Property="Template">
57+ <Setter.Value>
58+ <ControlTemplate TargetType="{x:Type TabControl}">
59+ <Grid>
60+ <Grid.RowDefinitions>
61+ <RowDefinition Height="Auto"/>
62+ <RowDefinition Height="*"/>
63+ </Grid.RowDefinitions>
64+ <TabPanel Grid.Row="0"
65+ Panel.ZIndex="1"
66+ Margin="0,0,4,-1"
67+ IsItemsHost="True"
68+ Background="Transparent" />
69+ <Border Grid.Row="1"
70+ BorderBrush="DarkGray"
71+ BorderThickness="1" >
72+ <Border.Background>
73+ <ImageBrush ImageSource="/Canonical.UbuntuOne.Client.Views;component/Resources/tab_cloud.png" Stretch="None" AlignmentX="Right" AlignmentY="Top"/>
74+ </Border.Background>
75+ <ContentPresenter ContentSource="SelectedContent" />
76+ </Border>
77+ </Grid>
78+ </ControlTemplate>
79+ </Setter.Value>
80+ </Setter>
81+ </Style>
82+ </Window.Resources>
83 <Grid Margin="3">
84 <Grid.RowDefinitions>
85 <RowDefinition Height="50" />
86@@ -30,6 +88,11 @@
87 <RowDefinition Height="28" />
88 </Grid.RowDefinitions>
89 <Grid Grid.Row="0">
90+ <Grid.ColumnDefinitions>
91+ <ColumnDefinition Width="*" />
92+ <ColumnDefinition Width="81" />
93+ </Grid.ColumnDefinitions>
94+ <Grid Grid.Column="0">
95 <Grid.RowDefinitions>
96 <RowDefinition Height="*" />
97 <RowDefinition Height="*" />
98@@ -39,11 +102,13 @@
99 <ColumnDefinition Width="*" />
100 <ColumnDefinition Width="*" />
101 </Grid.ColumnDefinitions>
102- <ProgressBar Name="ConsumptionProgressbar" Grid.Column="0" HorizontalAlignment="Stretch" Margin="3" Minimum="0" Maximum="100"/>
103+ <ProgressBar Name="ConsumptionProgressbar" Grid.Column="0" HorizontalAlignment="Stretch" Margin="3" Minimum="0" Maximum="100" Value="40"/>
104 <Label Name="ConsumptionLabel" Grid.Column="1">Unknown</Label>
105 </Grid>
106 <Label Name="StatusLabel" Grid.Row="1">Disconnected</Label>
107 </Grid>
108+ <Image Source="/Canonical.UbuntuOne.Client.Views;component/Resources/title_logo.png" Grid.Column="1"/>
109+ </Grid>
110 <TabControl Margin="3" Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
111 <TabItem Header="{x:Static resx:Resources.PreferencesDialogAccountTabHeader}" >
112 <Views:AccountView x:Name="AccountsTab" Height="300" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
113
114=== added file 'src/Canonical.UbuntuOne.Client.Views/Resources/tab_cloud.png'
115Binary 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
116=== added file 'src/Canonical.UbuntuOne.Client.Views/Resources/title_logo.png'
117Binary 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

Subscribers

People subscribed via source and target branches

to all changes: