Ubuntu One Windows Installer

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

  1. remove_recently_modifed_state_spaces
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: John Lenton
Approved revision: 163
Merged at revision: 126
Proposed branch: lp:~mandel/ubuntuone-windows-installer/remove_recently_modifed_state_spaces
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/use_correct_version
Diff against target: 70 lines (+10/-14)
3 files modified
src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml (+1/-9)
src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs (+8/-4)
src/UbuntuOneClient/Config/log4net.config (+1/-1)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/remove_recently_modifed_state_spaces
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+39905@code.launchpad.net

Description of the change

Remove the not used used ui items.

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.UbuntuOne.Client.Views/NotifyIcon.xaml'
2--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml 2010-10-20 23:09:36 +0000
3+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml 2010-11-02 22:21:08 +0000
4@@ -89,15 +89,7 @@
5 Click="OnOpenSyncMenuItemClick"/>
6 <Separator />
7 <MenuItem Name="StateMenuItem"
8- Header="State"/> <!-- Out sync, sync in progress (animate), everything up to date, error -->
9- <MenuItem Name="CompleteInfoMenuItem"
10- Header=""/>
11- <MenuItem Name="SpaceLeftMenuItem"
12- Header=""/>
13- <Separator />
14- <MenuItem x:Uid="RecentlyModifyFilesMenuItem"
15- Name="RecentlyModifyFilesMenuItem"
16- Header="{x:Static resx:Resources.NotificationIconRecentlyModifyFilesLabel}" />
17+ Header="State"/>
18 <Separator />
19 <MenuItem x:Uid="HelpMenuItem"
20 Name="HelpMenuItem"
21
22=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
23--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-10-20 23:09:36 +0000
24+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-11-02 22:21:08 +0000
25@@ -62,8 +62,8 @@
26 public bool IsManualSyncEnabled
27 {
28 get { return UbuntuOneManualSync.IsEnabled; }
29- set
30- {
31+ set
32+ {
33 UbuntuOneManualSync.IsEnabled = value;
34 if (!UbuntuOneManualSync.IsEnabled)
35 {
36@@ -104,7 +104,11 @@
37 public string State
38 {
39 get { return (string)StateMenuItem.Header; }
40- set { StateMenuItem.Header = value; }
41+ set
42+ {
43+ StateMenuItem.Header = value;
44+ Title = value;
45+ }
46 }
47
48 /// <summary>
49@@ -125,7 +129,7 @@
50 {
51 get
52 {
53- if(_dispatcher == null)
54+ if (_dispatcher == null)
55 {
56 lock (_dispatcherLock)
57 {
58
59=== modified file 'src/UbuntuOneClient/Config/log4net.config'
60--- src/UbuntuOneClient/Config/log4net.config 2010-10-20 14:28:58 +0000
61+++ src/UbuntuOneClient/Config/log4net.config 2010-11-02 22:21:08 +0000
62@@ -2,7 +2,7 @@
63 <log4net>
64 <appender name="RollingFileAppender"
65 type="log4net.Appender.RollingFileAppender">
66- <file value="~/Logs/Client.log" />
67+ <file value="Logs/Client.log" />
68 <appendToFile value="true" />
69 <rollingStyle value="Size" />
70 <maxSizeRollBackups value="10" />

Subscribers

People subscribed via source and target branches

to all changes: