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

[Manuel de la Peña]

Fixes lp:655286 and lp:655292 by connecting the view with the presenter.

[John Lenton (chipaca)]

review: Approve

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-10-05 18:19:18 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-10-05 18:19:18 +0000
@@ -62,10 +62,12 @@
                         <Separator />
                         <MenuItem x:Uid="HelpMenuItem" 
                                   Name="HelpMenuItem" 
-                                  Header="{x:Static resx:Resources.Help}" />
+                                  Header="{x:Static resx:Resources.Help}" 
+                                  Click="HelpMenuItemClick"/>
                         <MenuItem x:Uid="MoreSpaceMenuItem" 
                                   Name="MoreSpaceMenuItem" 
-                                  Header="{x:Static resx:Resources.MoreSpace}"/>
+                                  Header="{x:Static resx:Resources.MoreSpace}"
+                                  Click="MoreSpaceMenuItemClick"/>
                         <MenuItem x:Uid="ExitMenuItem" 
                                   Name="ExitMenuItem" 
                                   Header="{x:Static resx:Resources.Exit}" 
 
=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-10-05 18:19:18 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-10-05 18:19:18 +0000
@@ -95,5 +95,15 @@
         {
             NotificationIconPresenter.Exit();
         }
+
+        private void HelpMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
+        {
+            NotificationIconPresenter.OpenHelp();
+        }
+
+        private void MoreSpaceMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
+        {
+            NotificationIconPresenter.OpenUpgradeOption();
+        }
     }
 }