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

[Manuel de la Peña]

Changed the login view to use the data from the resource file and added the correct text.

[John Lenton (chipaca)]

review: Approve

=== modified file 'src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml'
--- src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml	2010-10-05 15:20:36 +0000
+++ src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml	2010-11-14 22:06:14 +0000
@@ -61,11 +61,11 @@
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="85"/>
-                <ColumnDefinition Width="85"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <Button Name="LoginButton" Grid.Column="1" Margin="3" Click="ConnectButtonClick">Connect</Button>
-            <Button Name="CancelButton" Grid.Column="2" Margin="3" Click="CancelButtonClick">Cancel</Button>
+            <Button Name="LoginButton" Grid.Column="1" Margin="3" Click="ConnectButtonClick" Content="{x:Static resx:Resources.LoginViewConnectButtonText}"/>
+            <Button Name="CancelButton" Grid.Column="2" Margin="3" Click="CancelButtonClick" Content="{x:Static resx:Resources.LoginViewCancelButtonText}"/>
         </Grid>
     </Grid>
 </Window>

=== modified file 'src/Canonical.Ubuntu.SSO.Views/Resources/Resources.Designer.cs'
--- src/Canonical.Ubuntu.SSO.Views/Resources/Resources.Designer.cs	2010-10-12 12:42:38 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Resources/Resources.Designer.cs	2010-11-14 22:06:14 +0000
@@ -88,6 +88,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Cancel.
+        /// </summary>
+        public static string LoginViewCancelButtonText {
+            get {
+                return ResourceManager.GetString("LoginViewCancelButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connect to Ubuntu One.
+        /// </summary>
+        public static string LoginViewConnectButtonText {
+            get {
+                return ResourceManager.GetString("LoginViewConnectButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to To connect this computer to Ubuntu One enter your details below..
         /// </summary>
         public static string LoginViewInfo {

=== modified file 'src/Canonical.Ubuntu.SSO.Views/Resources/Resources.resx'
--- src/Canonical.Ubuntu.SSO.Views/Resources/Resources.resx	2010-10-05 11:19:52 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Resources/Resources.resx	2010-11-14 22:06:14 +0000
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="LoginEmailAddressWatermark" xml:space="preserve">
     <value>Email address</value>
@@ -126,6 +126,12 @@
   <data name="LoginPasswordWatermark" xml:space="preserve">
     <value>Password</value>
   </data>
+  <data name="LoginViewCancelButtonText" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="LoginViewConnectButtonText" xml:space="preserve">
+    <value>Connect to Ubuntu One</value>
+  </data>
   <data name="LoginViewInfo" xml:space="preserve">
     <value>To connect this computer to Ubuntu One enter your details below.</value>
   </data>