Ubuntu One Windows Installer

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

  1. fix_help_space
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Rick McBride
Approved revision: 94
Merged at revision: 95
Proposed branch: lp:~mandel/ubuntuone-windows-installer/fix_help_space
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/fix_648595
Diff against target: 38 lines (+14/-2)
2 files modified
src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml (+4/-2)
src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs (+10/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/fix_help_space
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
John Lenton (community) Approve
Review via email: mp+37649@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Rick McBride (rmcbride) :
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/NotifyIcon.xaml'
2--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml 2010-10-05 18:19:18 +0000
3+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml 2010-10-05 18:19:18 +0000
4@@ -62,10 +62,12 @@
5 <Separator />
6 <MenuItem x:Uid="HelpMenuItem"
7 Name="HelpMenuItem"
8- Header="{x:Static resx:Resources.Help}" />
9+ Header="{x:Static resx:Resources.Help}"
10+ Click="HelpMenuItemClick"/>
11 <MenuItem x:Uid="MoreSpaceMenuItem"
12 Name="MoreSpaceMenuItem"
13- Header="{x:Static resx:Resources.MoreSpace}"/>
14+ Header="{x:Static resx:Resources.MoreSpace}"
15+ Click="MoreSpaceMenuItemClick"/>
16 <MenuItem x:Uid="ExitMenuItem"
17 Name="ExitMenuItem"
18 Header="{x:Static resx:Resources.Exit}"
19
20=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
21--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-10-05 18:19:18 +0000
22+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-10-05 18:19:18 +0000
23@@ -95,5 +95,15 @@
24 {
25 NotificationIconPresenter.Exit();
26 }
27+
28+ private void HelpMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
29+ {
30+ NotificationIconPresenter.OpenHelp();
31+ }
32+
33+ private void MoreSpaceMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
34+ {
35+ NotificationIconPresenter.OpenUpgradeOption();
36+ }
37 }
38 }

Subscribers

People subscribed via source and target branches

to all changes: