Ubuntu One Windows Installer

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

  1. make_login_atractive
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: John Lenton
Approved revision: 107
Merged at revision: 138
Proposed branch: lp:~mandel/ubuntuone-windows-installer/make_login_atractive
Merge into: lp:ubuntuone-windows-installer/beta
Diff against target: 56 lines (+12/-6)
2 files modified
src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj (+3/-0)
src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml (+9/-6)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/make_login_atractive
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+40827@code.launchpad.net

Description of the change

Added decorations to the login screen.

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.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj'
2--- src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj 2010-10-21 11:06:01 +0000
3+++ src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj 2010-11-15 02:08:49 +0000
4@@ -151,6 +151,9 @@
5 <Install>true</Install>
6 </BootstrapperPackage>
7 </ItemGroup>
8+ <ItemGroup>
9+ <Resource Include="Resources\cloud.png" />
10+ </ItemGroup>
11 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
12 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
13 Other similar extension points exist, see Microsoft.Common.targets.
14
15=== modified file 'src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml'
16--- src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml 2010-10-05 15:20:36 +0000
17+++ src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml 2010-11-15 02:08:49 +0000
18@@ -3,11 +3,14 @@
19 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
20 xmlns:controls="clr-namespace:Canonical.Ubuntu.SSO.Views"
21 xmlns:resx="clr-namespace:Canonical.Ubuntu.SSO.Views.Resources"
22- Title="Login" Height="350" Width="550">
23- <Grid Margin="10">
24+ Title="Login" Height="350" Width="550" Background="#f2f5fa" ResizeMode="NoResize">
25+ <Grid Margin="0" >
26+ <Grid.Background>
27+ <ImageBrush ImageSource="/Canonical.Ubuntu.SSO.Views;component/Resources/cloud.png" Opacity="1" Stretch="None" AlignmentX="Left" AlignmentY="Top"/>
28+ </Grid.Background>
29 <Grid.RowDefinitions>
30 <RowDefinition Height="*" />
31- <RowDefinition Height="28" />
32+ <RowDefinition Height="50" />
33 </Grid.RowDefinitions>
34 <Grid Grid.Row="0">
35 <Grid.RowDefinitions>
36@@ -58,14 +61,14 @@
37 <TextBlock Name="ForgottenLink" Grid.Column="1" Margin="3" TextAlignment="Center"><Hyperlink >I've forgotten my password.</Hyperlink></TextBlock>
38 </Grid>
39 </Grid>
40- <Grid Grid.Row="1">
41+ <Grid Grid.Row="1" Background="White">
42 <Grid.ColumnDefinitions>
43 <ColumnDefinition Width="*"/>
44 <ColumnDefinition Width="85"/>
45 <ColumnDefinition Width="85"/>
46 </Grid.ColumnDefinitions>
47- <Button Name="LoginButton" Grid.Column="1" Margin="3" Click="ConnectButtonClick">Connect</Button>
48- <Button Name="CancelButton" Grid.Column="2" Margin="3" Click="CancelButtonClick">Cancel</Button>
49+ <Button Name="LoginButton" Grid.Column="1" Margin="3" Height="28" Click="ConnectButtonClick">Connect</Button>
50+ <Button Name="CancelButton" Grid.Column="2" Margin="3" Height="28" Click="CancelButtonClick">Cancel</Button>
51 </Grid>
52 </Grid>
53 </Window>
54
55=== added file 'src/Canonical.Ubuntu.SSO.Views/Resources/cloud.png'
56Binary files src/Canonical.Ubuntu.SSO.Views/Resources/cloud.png 1970-01-01 00:00:00 +0000 and src/Canonical.Ubuntu.SSO.Views/Resources/cloud.png 2010-11-15 02:08:49 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: