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

[Manuel de la Peña]

Adds a beta tab so that the user knows about the state of the port.

[John Lenton (chipaca)]

heh. Are the contacts synced now? And now? And now?

review: Approve

=== modified file 'main.build'
--- main.build	2010-11-10 15:36:48 +0000
+++ main.build	2010-11-10 15:36:48 +0000
@@ -236,6 +236,12 @@
               workingdir="src/emblems_cache"
               program="python.exe"
               commandline="setup.py py2exe --packages=pkg_resources" />
+              
+        <exec basedir="${python_path}"
+              managed="true"
+              workingdir="src/icons_overlay"
+              program="python.exe"
+              commandline="setup.py py2exe --packages=pkg_resources" />
         
     </target>
     

=== added file 'src/Canonical.UbuntuOne.Client.Views/BetaView.xaml'
--- src/Canonical.UbuntuOne.Client.Views/BetaView.xaml	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/BetaView.xaml	2010-11-10 15:36:48 +0000
@@ -0,0 +1,47 @@
+<UserControl x:Class="Canonical.UbuntuOne.Client.Views.BetaView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300"
+             Background="White">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock Name="IntroText" Grid.Row="0" TextWrapping="Wrap" TextAlignment="Justify">Thank you for participating in the Ubuntu One for Windows beta test. The application currently synchronizes your files between your Windows computer and your Ubuntu One personal cloud.</TextBlock>
+        <Grid Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition  Height="Auto"/>
+            </Grid.RowDefinitions>
+            <TextBlock Grid.Row="0" TextWrapping="Wrap" TextAlignment="Justify" Margin="0 3 3 3">Features coming soon:</TextBlock>
+            <TextBlock Grid.Row="1" TextWrapping="Wrap" TextAlignment="Justify" Margin="14 0 3 0">Automatic sync when files change</TextBlock>
+            <TextBlock Grid.Row="2" TextWrapping="Wrap" TextAlignment="Justify" Margin="14 0 3 0">Information about your account, added devices, and more finite sync settings</TextBlock>
+            <TextBlock Grid.Row="3" TextWrapping="Wrap" TextAlignment="Justify" Margin="14 0 3 0">Sync folders outside of the “Ubuntu One” folder</TextBlock>
+            <TextBlock Grid.Row="4" TextWrapping="Wrap" TextAlignment="Justify" Margin="14 0 3 0">Enhanced desktop sync notifications</TextBlock>
+            <TextBlock Grid.Row="5" TextWrapping="Wrap" TextAlignment="Justify" Margin="14 0 3 0">Sync contacts, notes and bookmarks</TextBlock>
+            <TextBlock Grid.Row="6" TextWrapping="Wrap" TextAlignment="Justify" Margin="14 0 3 0">Include Tomboy and Banshee (with the Ubuntu One Music Store) as optional components of the application installation</TextBlock>
+        </Grid>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <TextBlock TextWrapping="Wrap" TextAlignment="Justify" Margin="3">
+            Review the  <Hyperlink NavigateUri="https://wiki.ubuntu.com/UbuntuOne/Windows">Ubuntu One wiki page</Hyperlink> to learn more about testing recommendations.
+            </TextBlock>
+            <TextBlock Grid.Row="1" TextWrapping="Wrap" TextAlignment="Justify" Margin="3">
+            Found a bug? <Hyperlink NavigateUri="https://bugs.launchpad.net/ubuntuone-windows-installer/">Tell us about it on Launchpad</Hyperlink>.
+            </TextBlock>
+        </Grid>
+    </Grid>
+</UserControl>

=== added file 'src/Canonical.UbuntuOne.Client.Views/BetaView.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/BetaView.xaml.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/BetaView.xaml.cs	2010-11-10 15:36:48 +0000
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Canonical.UbuntuOne.Client.Views
+{
+    /// <summary>
+    /// Interaction logic for BetaView.xaml
+    /// </summary>
+    public partial class BetaView : UserControl
+    {
+        public BetaView()
+        {
+            InitializeComponent();
+        }
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-10-20 10:28:53 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-11-10 15:36:48 +0000
@@ -83,6 +83,9 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BetaView.xaml.cs">
+      <DependentUpon>BetaView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WindowsSettingsView.xaml.cs">
       <DependentUpon>WindowsSettingsView.xaml</DependentUpon>
     </Compile>
@@ -90,6 +93,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="BetaView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DevicesView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

=== modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml'
--- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml	2010-10-13 10:38:57 +0000
+++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml	2010-11-10 15:36:48 +0000
@@ -22,7 +22,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
     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="300">
+    Title="{x:Static resx:Resources.PreferencesDialogTitle}" Height="450" Width="400">
     <Grid Margin="3">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
@@ -45,10 +45,14 @@
             <Label Name="StatusLabel" Grid.Row="1">Disconnected</Label>
         </Grid>
         <TabControl Margin="3" Grid.Row="1">
+            <TabItem Header="Beta" >
+                <Views:BetaView x:Name="BetaTab" Height="300" IsEnabled="False"/>
+            </TabItem>
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogWindowsTabHeader}">
                 <Views:WindowsSettingsView x:Name="WindowsTab" Height="300" />
             </TabItem>
-            <TabItem Header="{x:Static resx:Resources.PreferencesDialogAccountTabHeader}">
+            <!--
+            <TabItem Header="{x:Static resx:Resources.PreferencesDialogAccountTabHeader}" >
                 <Views:AccountView x:Name="AccountsTab" Height="300" IsEnabled="False"/>
             </TabItem>
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogDevicesTabHeader}" >
@@ -56,7 +60,8 @@
             </TabItem>
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogServicesTabHeader}" >
                 <Views:ServicesView x:Name="ServicesTab" Height="300" IsEnabled="False"/>
-            </TabItem>
+            </TabItem> 
+            -->
         </TabControl>
         <Button Name="CloseButton" Grid.Row="2"  HorizontalAlignment="Right" Width="75" Content="{x:Static resx:Resources.CloseButtonLabel}" Click="OnCloseButtonClick"/>
     </Grid>

=== modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs	2010-10-20 23:09:36 +0000
+++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs	2010-11-10 15:36:48 +0000
@@ -43,49 +43,94 @@
             InitializeComponent();
         }
 
+        //public string UserName
+        //{
+        //    set { AccountsTab.UserName = value; }
+        //}
+
+        //public string Email
+        //{
+        //    set { AccountsTab.Email = value; }
+        //}
+
+        //public string CurrentPlan
+        //{
+        //    set { AccountsTab.CurrentPlan = value; }
+        //}
+
+        //public bool IsBookmarksSynced
+        //{
+        //    get { return ServicesTab.IsBookmarksSynced; }
+        //    set { ServicesTab.IsBookmarksSynced = value; }
+        //}
+
+        //public bool IsBroadcastSynced
+        //{
+        //    get { return ServicesTab.IsBroadcastSynced; }
+        //    set { ServicesTab.IsBroadcastSynced = value; }
+        //}
+
+        //public bool IsContactsSynced
+        //{
+        //    get { return ServicesTab.IsContactsSynced; }
+        //    set { ServicesTab.IsContactsSynced = value; }
+        //}
+
+        //public bool IsFilesSynced
+        //{
+        //    get { return ServicesTab.IsFilesSynced; }
+        //    set { ServicesTab.IsFilesSynced = value; }
+        //}
+
+        //public bool IsMusicSynced
+        //{
+        //    get { return ServicesTab.IsMusicSynced; }
+        //    set { ServicesTab.IsMusicSynced = value; }
+        //}
+
         public string UserName
         {
-            set { AccountsTab.UserName = value; }
+            set {  }
         }
 
         public string Email
         {
-            set { AccountsTab.Email = value; }
+            set {  }
         }
 
         public string CurrentPlan
         {
-            set { AccountsTab.CurrentPlan = value; }
+            set {  }
         }
 
         public bool IsBookmarksSynced
         {
-            get { return ServicesTab.IsBookmarksSynced; }
-            set { ServicesTab.IsBookmarksSynced = value; }
+            get { return false; }
+            set {  }
         }
 
         public bool IsBroadcastSynced
         {
-            get { return ServicesTab.IsBroadcastSynced; }
-            set { ServicesTab.IsBroadcastSynced = value; }
+            get { return false; }
+            set {  }
         }
 
         public bool IsContactsSynced
         {
-            get { return ServicesTab.IsContactsSynced; }
-            set { ServicesTab.IsContactsSynced = value; }
+            get { return false; }
+            set {  }
         }
 
         public bool IsFilesSynced
         {
-            get { return ServicesTab.IsFilesSynced; }
-            set { ServicesTab.IsFilesSynced = value; }
+            get { return false; }
+            set {  }
         }
 
         public bool IsMusicSynced
         {
-            get { return ServicesTab.IsMusicSynced; }
-            set { ServicesTab.IsMusicSynced = value; }
+            get { return false; }
+            set {  }
         }
 
         public bool IsAutoSyncEnable