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

[Manuel de la Peña]

Ensures that the default folder name is 'Ubuntu One'

Ensures that the default folder name is 'Ubuntu One'

[John Lenton (chipaca)]

review: Approve

[lp:~mandel/ubuntuone-windows-installer/use_correct_folder_name]

177. By Manuel de la Peña on 2010-11-11

Added resources to point to the correct directory name.

178. By Manuel de la Peña on 2010-11-11

Updated solution

=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-11-11 11:46:48 +0000
+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-11-11 11:46:48 +0000
@@ -95,6 +95,11 @@
     <Compile Include="Preferences\LoadPreferencesStartupTask.cs" />
     <Compile Include="Preferences\PreferencesDialogPresenter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="SyncDaemonClient.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -146,6 +151,10 @@
       <LastGenOutput>NotificationResources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="objects.xml" />

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-20 11:18:55 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-11-11 11:46:48 +0000
@@ -18,12 +18,10 @@
  */
 using System;
 using System.IO;
-using System.ServiceModel;
 using Canonical.Ubuntu.SSO;
 using Canonical.UbuntuOne.Client.Preferences;
 using Canonical.UbuntuOne.Common;
 using Canonical.UbuntuOne.Common.Aop;
-using Canonical.UbuntuOne.Common.Net;
 using Canonical.UbuntuOne.Common.Utils;
 using log4net;
 
@@ -53,8 +51,8 @@
         private ISSOCredentialsProvider _ssoProvider;
         private ILog _logger;
         private readonly object _loggerLock = new object();
-        private static string EventName = "UbuntuOneNotificationIconPresenter";
-        private static string ApplicationName = "UbuntuOne";
+        private const string EventName = "UbuntuOneNotificationIconPresenter";
+        private const string ApplicationName = "UbuntuOne";
 
         #endregion
 
@@ -167,7 +165,7 @@
         static NotificationIconPresenter()
         {
             SharesLocation = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
-            SyncsLocation = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "UbuntuOne");
+            SyncsLocation = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), Resources.DefaulDirectoryName);
 
         }
 
@@ -243,7 +241,7 @@
             
             Logger.Info("Got the UbuntuOne credentials!");
             var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                                      "UbuntuOne");
+                                      Resources.DefaulDirectoryName);
             // ensure that the path can be handled by the python code
             oneDir = oneDir.Replace("\\", "\\\\");
             SyncDaemon.ManualSync(

=== modified file 'src/Canonical.UbuntuOne.Client/Preferences/LoadPreferencesStartupTask.cs'
--- src/Canonical.UbuntuOne.Client/Preferences/LoadPreferencesStartupTask.cs	2010-10-20 11:18:55 +0000
+++ src/Canonical.UbuntuOne.Client/Preferences/LoadPreferencesStartupTask.cs	2010-11-11 11:46:48 +0000
@@ -109,7 +109,7 @@
             if (args.ApplicationName != EventName) return;
             Logger.Info("Got the UbuntuOne credentials!");
             var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                                      "UbuntuOne");
+                                      Resources.DefaulDirectoryName);
             // ensure that the path can be handled by the python code
             oneDir = oneDir.Replace("\\", "\\\\");
             // call the ISyncService to perform the manual sync

=== modified file 'src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs	2010-10-20 11:18:55 +0000
+++ src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs	2010-11-11 11:46:48 +0000
@@ -116,7 +116,7 @@
             if (args.ApplicationName != EventName) return;
             Logger.Info("Got the UbuntuOne credentials!");
             var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                                      "UbuntuOne");
+                                      Resources.DefaulDirectoryName);
             // ensure that the path can be handled by the python code
             oneDir = oneDir.Replace("\\", "\\\\");
             // call the ISyncService to perform the manual sync

=== added file 'src/Canonical.UbuntuOne.Client/Resources.Designer.cs'
--- src/Canonical.UbuntuOne.Client/Resources.Designer.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/Resources.Designer.cs	2010-11-11 11:46:48 +0000
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.1
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Canonical.UbuntuOne.Client {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Canonical.UbuntuOne.Client.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ubuntu One.
+        /// </summary>
+        internal static string DefaulDirectoryName {
+            get {
+                return ResourceManager.GetString("DefaulDirectoryName", resourceCulture);
+            }
+        }
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/Resources.resx'
--- src/Canonical.UbuntuOne.Client/Resources.resx	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/Resources.resx	2010-11-11 11:46:48 +0000
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DefaulDirectoryName" xml:space="preserve">
+    <value>Ubuntu One</value>
+  </data>
+</root>
\ No newline at end of file