--- 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 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <Compile Include="ActionBase.cs" />
+ <Compile Include="ActionGenerator.cs" />
+ <Compile Include="ActionPlayMedia.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
--- 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 @@
<Application x:Class="TestMenu.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- StartupUri="Window1.xaml">
+ StartupUri="SurfaceWindow1.xaml"
+ >
<Application.Resources>
-
+ <ResourceDictionary>
+ <ResourceDictionary.MergedDictionaries>
+ <ResourceDictionary Source="/Microsoft.Surface.Presentation.Generic;v1.0.0.0;31bf3856ad364e35;component/themes\generic.xaml"/>
+ </ResourceDictionary.MergedDictionaries>
+ </ResourceDictionary>
</Application.Resources>
</Application>
--- 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
{
/// <summary>
- /// Logique d'interaction pour App.xaml
+ /// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
+
}
-}
+}
\ No newline at end of file
--- 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
-//<UICulture>CultureYouAreCodingWith</UICulture> dans votre fichier .csproj
-//dans <PropertyGroup>. Par exemple, si vous utilisez le français
-//dans vos fichiers sources, définissez <UICulture> à 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
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>. For example, if you are using US english
+//in your source files, set the <UICulture> 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.*")]
--- 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 @@
//------------------------------------------------------------------------------
// <auto-generated>
-// 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.
// </auto-generated>
//------------------------------------------------------------------------------
namespace TestMenu.Properties
{
+ using System;
/// <summary>
- /// 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.
/// </summary>
- // 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 @@
}
/// <summary>
- /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
+ /// 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 ((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 @@
}
/// <summary>
- /// 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.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
--- 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 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
--- 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 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='iso-8859-1'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
--- 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{FD3E5387-E72C-4C6E-8683-A78EF33928AC}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
+ <ProjectGuid>{2211F916-A6FF-40D4-BFC5-09AAB1088D3A}</ProjectGuid>
+ <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<RootNamespace>TestMenu</RootNamespace>
<AssemblyName>TestMenu</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
+ <OutputType>winexe</OutputType>
+ <Install>true</Install>
+ <InstallFrom>Web</InstallFrom>
+ <UpdateEnabled>true</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>false</MapFileExtensions>
+ <ApplicationVersion>1.0.0.*</ApplicationVersion>
+ <IsWebBootstrapper>true</IsWebBootstrapper>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <PublishUrl>Publish\</PublishUrl>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>.\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
+ <DebugSymbols>false</DebugSymbols>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>.\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -68,29 +73,36 @@
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
+ <Reference Include="Microsoft.Surface" />
+ <Reference Include="Microsoft.Surface.Presentation" />
+ <Reference Include="Microsoft.Surface.Presentation.Generic" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
- <Page Include="Window1.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
- <Compile Include="Window1.xaml.cs">
- <DependentUpon>Window1.xaml</DependentUpon>
- <SubType>Code</SubType>
- </Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs">
- <SubType>Code</SubType>
- </Compile>
+ <Compile Include="ActionBase.cs" />
+ <Compile Include="ActionFactory.cs" />
+ <Compile Include="ActionShowMessage.cs" />
+ <Compile Include="Item.cs" />
+ <Compile Include="Menu.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <SubType>Designer</SubType>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ <None Include="Properties\Settings.settings">
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+ </None>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -98,25 +110,31 @@
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- <None Include="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
+ <Compile Include="SurfaceWindow1.xaml.cs">
+ <DependentUpon>SurfaceWindow1.xaml</DependentUpon>
+ </Compile>
<AppDesigner Include="Properties\" />
</ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
+ <ItemGroup>
+ <Content Include="Resources\icon.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Resources\iconPreview.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Resource Include="TestMenu.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\WindowBackground.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <Page Include="SurfaceWindow1.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file