# HG changeset patch # User PAMPHILE Jonathan # Date 1249403670 -7200 # Node ID d174a6956f1107f0c7c60329f0aee8532d14c9af # Parent 16c8e9a54033c4e0bb504d6bad594df78920d099 Commit Jonathan diff -r 16c8e9a54033 -r d174a6956f11 src/FingersDance.Actions/FingersDance.Actions.csproj --- a/src/FingersDance.Actions/FingersDance.Actions.csproj Tue Aug 04 16:41:45 2009 +0200 +++ b/src/FingersDance.Actions/FingersDance.Actions.csproj Tue Aug 04 18:34:30 2009 +0200 @@ -68,6 +68,9 @@ + + + ResXFileCodeGenerator diff -r 16c8e9a54033 -r d174a6956f11 test/TestMenu/TestMenu/App.xaml --- a/test/TestMenu/TestMenu/App.xaml Tue Aug 04 16:41:45 2009 +0200 +++ b/test/TestMenu/TestMenu/App.xaml Tue Aug 04 18:34:30 2009 +0200 @@ -1,8 +1,13 @@  + StartupUri="SurfaceWindow1.xaml" + > - + + + + + diff -r 16c8e9a54033 -r d174a6956f11 test/TestMenu/TestMenu/App.xaml.cs --- a/test/TestMenu/TestMenu/App.xaml.cs Tue Aug 04 16:41:45 2009 +0200 +++ b/test/TestMenu/TestMenu/App.xaml.cs Tue Aug 04 18:34:30 2009 +0200 @@ -8,9 +8,10 @@ namespace TestMenu { /// - /// Logique d'interaction pour App.xaml + /// Interaction logic for App.xaml /// public partial class App : Application { + } -} +} \ No newline at end of file diff -r 16c8e9a54033 -r d174a6956f11 test/TestMenu/TestMenu/Properties/AssemblyInfo.cs --- a/test/TestMenu/TestMenu/Properties/AssemblyInfo.cs Tue Aug 04 16:41:45 2009 +0200 +++ b/test/TestMenu/TestMenu/Properties/AssemblyInfo.cs Tue Aug 04 18:34:30 2009 +0200 @@ -1,55 +1,62 @@ -using System.Reflection; +#region Using directives + +using System.Reflection; +using System.Runtime.CompilerServices; using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Globalization; using System.Windows; +using System.Runtime.InteropServices; -// Les informations générales relatives à un assembly dépendent de -// l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations -// associées à un assembly. +#endregion + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. [assembly: AssemblyTitle("TestMenu")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("TestMenu")] -[assembly: AssemblyCopyright("Copyright © 2009")] +[assembly: AssemblyCopyright("Copyright @ 2009")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] - -// L'affectation de la valeur false à ComVisible rend les types invisibles dans cet assembly -// aux composants COM. Si vous devez accéder à un type dans cet assembly à partir de -// COM, affectez la valeur true à l'attribut ComVisible sur ce type. [assembly: ComVisible(false)] -//Pour commencer à générer des applications localisables, définissez -//CultureYouAreCodingWith dans votre fichier .csproj -//dans . Par exemple, si vous utilisez le français -//dans vos fichiers sources, définissez à fr-FR. Puis, supprimez les marques de commentaire de -//l'attribut NeutralResourceLanguage ci-dessous. Mettez à jour "fr-FR" dans -//la ligne ci-après pour qu'elle corresponde au paramètre UICulture du fichier projet. +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] +// Specifies the location in which theme dictionaries are stored for types in an assembly. [assembly: ThemeInfo( - ResourceDictionaryLocation.None, //où se trouvent les dictionnaires de ressources spécifiques à un thème - //(utilisé si une ressource est introuvable dans la page, - // ou dictionnaires de ressources de l'application) - ResourceDictionaryLocation.SourceAssembly //où se trouve le dictionnaire de ressources générique - //(utilisé si une ressource est introuvable dans la page, - // dans l'application ou dans l'un des dictionnaires de ressources spécifiques à un thème) -)] + // Specifies the location of system theme-specific resource dictionaries for this project. + // The default setting in this project is "None" since this default project does not + // include these user-defined theme files: + // Themes\Aero.NormalColor.xaml + // Themes\Classic.xaml + // Themes\Luna.Homestead.xaml + // Themes\Luna.Metallic.xaml + // Themes\Luna.NormalColor.xaml + // Themes\Royale.NormalColor.xaml + ResourceDictionaryLocation.None, + + // Specifies the location of the system non-theme specific resource dictionary: + // Themes\generic.xaml + ResourceDictionaryLocation.SourceAssembly)] -// Les informations de version pour un assembly se composent des quatre valeurs suivantes : +// Version information for an assembly consists of the following four values: // -// Version principale -// Version secondaire -// Numéro de build -// Révision +// Major Version +// Minor Version +// Build Number +// Revision // -// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut -// en utilisant '*', comme indiqué ci-dessous : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.*")] diff -r 16c8e9a54033 -r d174a6956f11 test/TestMenu/TestMenu/Properties/Resources.Designer.cs --- a/test/TestMenu/TestMenu/Properties/Resources.Designer.cs Tue Aug 04 16:41:45 2009 +0200 +++ b/test/TestMenu/TestMenu/Properties/Resources.Designer.cs Tue Aug 04 18:34:30 2009 +0200 @@ -1,24 +1,25 @@ //------------------------------------------------------------------------------ // -// Ce code a été généré par un outil. -// Version du runtime :2.0.50727.3074 +// This code was generated by a tool. +// Runtime Version:2.0.50727.3074 // -// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si -// le code est régénéré. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ namespace TestMenu.Properties { + using System; /// - /// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder - // à l'aide d'un outil, tel que ResGen ou Visual Studio. - // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen - // avec l'option /str ou régénérez votre projet VS. + // 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", "2.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -35,16 +36,16 @@ } /// - /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { - if ((resourceMan == null)) + if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TestMenu.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPFAppTemplate.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -52,8 +53,8 @@ } /// - /// Remplace la propriété CurrentUICulture du thread actuel pour toutes - /// les recherches de ressources à l'aide de cette classe de ressource fortement typée. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture diff -r 16c8e9a54033 -r d174a6956f11 test/TestMenu/TestMenu/Properties/Resources.resx --- a/test/TestMenu/TestMenu/Properties/Resources.resx Tue Aug 04 16:41:45 2009 +0200 +++ b/test/TestMenu/TestMenu/Properties/Resources.resx Tue Aug 04 18:34:30 2009 +0200 @@ -109,9 +109,9 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff -r 16c8e9a54033 -r d174a6956f11 test/TestMenu/TestMenu/Properties/Settings.settings --- a/test/TestMenu/TestMenu/Properties/Settings.settings Tue Aug 04 16:41:45 2009 +0200 +++ b/test/TestMenu/TestMenu/Properties/Settings.settings Tue Aug 04 18:34:30 2009 +0200 @@ -1,4 +1,4 @@ - + diff -r 16c8e9a54033 -r d174a6956f11 test/TestMenu/TestMenu/TestMenu.csproj --- a/test/TestMenu/TestMenu/TestMenu.csproj Tue Aug 04 16:41:45 2009 +0200 +++ b/test/TestMenu/TestMenu/TestMenu.csproj Tue Aug 04 18:34:30 2009 +0200 @@ -1,36 +1,41 @@ - - + Debug AnyCPU - 9.0.21022 - 2.0 - {FD3E5387-E72C-4C6E-8683-A78EF33928AC} - WinExe - Properties + {2211F916-A6FF-40D4-BFC5-09AAB1088D3A} + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} TestMenu TestMenu v3.5 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + winexe + true + Web + true + Foreground + 7 + Days + false + false + false + 1.0.0.* + true + true + Publish\ + OnBuildSuccess true full false - bin\Debug\ + .\bin\Debug\ DEBUG;TRACE - prompt - 4 - pdbonly + false true - bin\Release\ + .\bin\Release\ TRACE - prompt - 4 true @@ -68,29 +73,36 @@ + + + MSBuild:Compile Designer - - MSBuild:Compile - Designer - App.xaml Code - - Window1.xaml - Code - - - Code - + + + + + + + + ResXFileCodeGenerator + Designer + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + True True @@ -98,25 +110,31 @@ True + True Settings.settings - True - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - + + SurfaceWindow1.xaml + - - + + + PreserveNewest + + + PreserveNewest + + + + + + + + + MSBuild:Compile + Designer + + + \ No newline at end of file