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

[Manuel de la Peña]

Fix lp:655853 by connecting the presenter with the UI. Disable open shares until sync daemon has been ported.

[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:11:43 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-10-12 12:16:43 +0000
@@ -44,10 +44,12 @@
                                   Header="{x:Static resx:Resources.UbuntuOnePreferences}" />
                         <MenuItem x:Uid="OpenShareManueItem"  
                                   Name="OpenShareManueItem" 
-                                  Header="{x:Static resx:Resources.OpenShares}" />
+                                  Header="{x:Static resx:Resources.OpenShares}"
+                                  IsEnabled="False"/> <!-- TODO: open the shares when ever syncdaemon ha been ported-->
                         <MenuItem x:Uid="OpenSyncMenuItem"  
                                   Name="OpenSyncMenuItem" 
-                                  Header="{x:Static resx:Resources.OpenSync}" />
+                                  Header="{x:Static resx:Resources.OpenSync}" 
+                                  Click="OnOpenShareManueItemClick"/>
                         <Separator />
                         <MenuItem Name="StateMenuItem" 
                                   Header="State"/> <!-- Out sync, sync in progress (animate), everything up to date, error -->
@@ -63,11 +65,11 @@
                         <MenuItem x:Uid="HelpMenuItem" 
                                   Name="HelpMenuItem" 
                                   Header="{x:Static resx:Resources.Help}" 
-                                  Click="HelpMenuItemClick"/>
+                                  Click="OnHelpMenuItemClick"/>
                         <MenuItem x:Uid="MoreSpaceMenuItem" 
                                   Name="MoreSpaceMenuItem" 
                                   Header="{x:Static resx:Resources.MoreSpace}"
-                                  Click="MoreSpaceMenuItemClick"/>
+                                  Click="OnMoreSpaceMenuItemClick"/>
                         <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:11:43 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-10-12 12:16:43 +0000
@@ -17,8 +17,6 @@
 // Authors: Manuel de la Peña <[e-mail]>
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using Canonical.UbuntuOne.Client.Notification;
 
 namespace Canonical.UbuntuOne.Client.Views
@@ -96,14 +94,20 @@
             NotificationIconPresenter.Exit();
         }
 
-        private void HelpMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
+        private void OnHelpMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
         {
             NotificationIconPresenter.OpenHelp();
         }
 
-        private void MoreSpaceMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
+        private void OnMoreSpaceMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
         {
             NotificationIconPresenter.OpenUpgradeOption();
         }
+
+        private void OnOpenShareManueItemClick(object sender, System.Windows.RoutedEventArgs e)
+        {
+            NotificationIconPresenter.OpenSyncsLocation();
+        }
+
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-12 12:16:42 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-12 12:16:43 +0000
@@ -170,7 +170,7 @@
         static NotificationIconPresenter()
         {
             SharesLocation = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
-            SyncsLocation = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            SyncsLocation = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "UbuntuOne");
         }
 
         #endregion
@@ -314,8 +314,8 @@
             {
                 Logger.WarnFormat("There was an error operning the SharesLocation, {0}", exception);
                 // use the view to notify the error
-                NotificationIconView.Notification = String.Format(NotificationResources.ErrorOpeningFolder,
-                    Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments));
+                MessageBox.ShowError(String.Format(NotificationResources.ErrorOpeningFolder,
+                    Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)));
                 throw;
             }
         }

=== modified file 'src/Canonical.UbuntuOne.Common/Utils/Explorer.cs'
--- src/Canonical.UbuntuOne.Common/Utils/Explorer.cs	2010-09-08 08:24:05 +0000
+++ src/Canonical.UbuntuOne.Common/Utils/Explorer.cs	2010-10-12 12:16:43 +0000
@@ -37,10 +37,6 @@
         /// </summary>
         public void OpenFolder(string folderFullPath)
         {
-            if(!File.Exists(folderFullPath))
-            {
-                throw new ExplorerException("File not found.");
-            }
             Process.Start(ExplorerProcess, folderFullPath);
         }