| author | sarias |
| Tue, 15 Sep 2009 18:20:09 +0200 | |
| changeset 61 | 9e2f007b19b3 |
| parent 60 | b4008a356f90 |
| child 62 | cbe5b01679a3 |
| child 67 | 70cca06f0a32 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/FingersDance.Control.SessionInput.csproj Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,105 @@ +<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> + <ProjectGuid>{4C5C068F-7D41-4563-9109-7B57485F4BED}</ProjectGuid> + <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <RootNamespace>FingersDance.Control.SaisieSeance</RootNamespace> + <AssemblyName>FingersDance.Control.SaisieSeance</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <WarningLevel>4</WarningLevel> + <OutputType>Library</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> + <StartupObject> + </StartupObject> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>.\bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugSymbols>false</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>.\bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Xml.Linq"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data.DataSetExtensions"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + <Reference Include="WindowsBase" /> + <Reference Include="PresentationCore" /> + <Reference Include="PresentationFramework" /> + <Reference Include="Microsoft.Surface" /> + <Reference Include="Microsoft.Surface.Presentation" /> + <Reference Include="Microsoft.Surface.Presentation.Generic" /> + <Page Include="UserControlSessionInput.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </Page> + <Compile Include="UserControlSessionInput.xaml.cs"> + <DependentUpon>UserControlSessionInput.xaml</DependentUpon> + </Compile> + </ItemGroup> + <ItemGroup> + <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> + <DependentUpon>Resources.resx</DependentUpon> + </Compile> + <Compile Include="Properties\Settings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTimeSharedInput>True</DesignTimeSharedInput> + <DependentUpon>Settings.settings</DependentUpon> + </Compile> + <AppDesigner Include="Properties\" /> + </ItemGroup> + <ItemGroup> + <Content Include="Resources\icon.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="Resources\iconPreview.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Resource Include="FingersDance.Control.SessionInput.xml" /> + </ItemGroup> + <ItemGroup> + <Resource Include="Resources\WindowBackground.jpg" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/FingersDance.Control.SessionInput.xml Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" ?> + +<!-- +This file contains the information needed to install your application +with the Surface Shell. Please refer to the documentation for deployment +instructions. +--> +<ss:ApplicationInfo + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ss="http://schemas.microsoft.com/Surface/2007/ApplicationMetadata"> + <Application> + <Title>FingersDance.Control.SessionInput</Title> + <Description>FingersDance.Control.SessionInput</Description> + <ExecutableFile>FingersDance.Control.SessionInput.exe</ExecutableFile> + <Arguments></Arguments> + <IconImageFile>Resources\icon.png</IconImageFile> + <Preview> + <PreviewImageFile>Resources\iconPreview.png</PreviewImageFile> + </Preview> + <Tags> + <!-- + If your application uses tagged objects, please uncomment this section to register the tags with the Shell. + You can register ByteTag(s), IdentityTag(s) or both by using the appropriate instructions below. + --> + <!-- + To register ByteTags: + 1. Please uncomment the Byte Tag Element below. + 2. Replace "C0" below with the value of your Byte Tag (in hexadecimal format). Repeat this section (this element and its children) for other Byte Tags + 3. Please remove the Launch element if you do not want to register the tag with Object Routing. + --> + <!-- + <ByteTag Value="C0"> + <Actions> + <Launch /> + </Actions> + </ByteTag> + --> + <!-- + To register IdentityTags: + 1. Please uncomment the Identity Tag Element below. + 2. Replace "0000000000000000" below with the series of your Identity Tag (in hexadecimal format). Repeat this section (this element and its children) for other Identity Tags + 3. Please remove the Launch element if you do not want to register the tag with Object Routing. + --> + <!-- + <IdentityTag Series="0000000000000000"> + <Actions> + <Launch /> + </Actions> + </IdentityTag> + --> + </Tags> + </Application> + + <!-- + Uncomment this section and comment out the Application element above + if you are creating an Attract Mode Application. + --> + <!-- + <AttractApplication> + <ExecutableFile>FingersDance.Control.SessionInput.exe</ExecutableFile> + <Arguments></Arguments> + </AttractApplication> + --> +</ss:ApplicationInfo> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/Properties/AssemblyInfo.cs Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,62 @@ +#region Using directives + +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Resources; +using System.Globalization; +using System.Windows; +using System.Runtime.InteropServices; + +#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("FingersDance.Control.SessionInput")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("FingersDance.Control.SessionInput")] +[assembly: AssemblyCopyright("Copyright @ 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: ComVisible(false)] + +//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( + // 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)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// 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.*")]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/Properties/Resources.Designer.cs Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:2.0.50727.3074 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace FingersDance.Control.SessionInput.Properties +{ + 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", "2.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("WPFAppTemplate.Properties.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; + } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/Properties/Resources.resx Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,117 @@ +<?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.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: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" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + </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" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + </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=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/Properties/Settings.Designer.cs Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:2.0.50727.3074 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace FingersDance.Control.SessionInput.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/Properties/Settings.settings Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='iso-8859-1'?> +<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)"> + <Profiles> + <Profile Name="(Default)" /> + </Profiles> + <Settings /> +</SettingsFile> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,28 @@ +<UserControl + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d" + x:Class="FingersDance.Control.SessionInput.UserControlSessionInput" + x:Name="UserControl" + Background="#FFA09E9E" Width="256" Height="192" xmlns:Custom="http://schemas.microsoft.com/surface/2008"> + + <Grid x:Name="LayoutRoot"> + <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,12.818,8,0" x:Name="ST_Name" VerticalAlignment="Top" Text="" TextWrapping="Wrap"/> + <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="112,40.978,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap"/> + <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment, Height" Margin="112,70.586,8,0" x:Name="ST_Alias" VerticalAlignment="Top" Text="" TextWrapping="Wrap"/> + <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="112,92.546,8,0" x:Name="ST_Email" VerticalAlignment="Top" Text="" TextWrapping="Wrap"/> + <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, Height" Margin="112,0,8,59.534" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap"/> + <Custom:SurfaceButton RenderTransformOrigin="0.5,0.5" Margin="82.321,0,123.679,5.534" VerticalAlignment="Bottom" Content="" Height="50"> + <Custom:SurfaceButton.RenderTransform> + <TransformGroup> + <ScaleTransform ScaleX="1" ScaleY="1"/> + <SkewTransform AngleX="0" AngleY="0"/> + <RotateTransform Angle="0"/> + <TranslateTransform X="0" Y="0"/> + </TransformGroup> + </Custom:SurfaceButton.RenderTransform> + </Custom:SurfaceButton> + </Grid> +</UserControl> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml.cs Tue Sep 15 18:20:09 2009 +0200 @@ -0,0 +1,22 @@ +using System; +using System.IO; +using System.Net; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Navigation; + +namespace FingersDance.Control.SessionInput +{ + public partial class UserControlSessionInput + { + public UserControlSessionInput() + { + this.InitializeComponent(); + + // Insert code required on object creation below this point. + } + } +} \ No newline at end of file
--- a/src/FingersDance.sln Tue Sep 15 16:57:45 2009 +0200 +++ b/src/FingersDance.sln Tue Sep 15 18:20:09 2009 +0200 @@ -33,6 +33,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Views", "FingersDance.Views\FingersDance.Views.csproj", "{0B308B6E-7B1E-46C0-ACC7-0B7EFC4D0B2C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.SessionInput", "FingersDance.Control.SessionInput\FingersDance.Control.SessionInput.csproj", "{4C5C068F-7D41-4563-9109-7B57485F4BED}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -155,6 +157,12 @@ {0B308B6E-7B1E-46C0-ACC7-0B7EFC4D0B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B308B6E-7B1E-46C0-ACC7-0B7EFC4D0B2C}.Release|Any CPU.Build.0 = Release|Any CPU {0B308B6E-7B1E-46C0-ACC7-0B7EFC4D0B2C}.Release|x86.ActiveCfg = Release|Any CPU + {4C5C068F-7D41-4563-9109-7B57485F4BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C5C068F-7D41-4563-9109-7B57485F4BED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C5C068F-7D41-4563-9109-7B57485F4BED}.Debug|x86.ActiveCfg = Debug|Any CPU + {4C5C068F-7D41-4563-9109-7B57485F4BED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C5C068F-7D41-4563-9109-7B57485F4BED}.Release|Any CPU.Build.0 = Release|Any CPU + {4C5C068F-7D41-4563-9109-7B57485F4BED}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE
--- a/src/FingersDance/App.xaml Tue Sep 15 16:57:45 2009 +0200 +++ b/src/FingersDance/App.xaml Tue Sep 15 18:20:09 2009 +0200 @@ -7,7 +7,7 @@ <ResourceDictionary> <ResourceDictionary.MergedDictionaries> <ResourceDictionary Source="/Microsoft.Surface.Presentation.Generic;v1.0.0.0;31bf3856ad364e35;component/themes\generic.xaml"/> - <ResourceDictionary Source="FingersDance.Control.Pivot.Ressource.xaml"/> + <ResourceDictionary Source="pack://application:,,,/FingersDance.Control.Pivot;component/FingersDance.Control.Pivot.Ressource.xaml"/> </ResourceDictionary.MergedDictionaries> </ResourceDictionary> </Application.Resources>
--- a/src/FingersDance/FingersDance.Control.Pivot.Ressource.xaml Tue Sep 15 16:57:45 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,203 +0,0 @@ -<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - <DrawingBrush x:Key="Ubber_Pivot_4_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 24.9768,0L 24.9768,24.8578L 0,24.8578L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 24.8578,49.7157C 11.1292,49.7157 0,38.5865 0,24.8578L 24.9768,24.8578" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 24.8578,49.7157C 38.5864,49.7157 49.7156,38.5865 49.7156,24.8578L 24.7388,24.8578" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 24.8578,0C 38.5864,0 49.7156,11.1292 49.7156,24.8578L 24.7388,24.8578" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 24.8578,0C 11.1292,0 0,11.1292 0,24.8578L 24.9768,24.8578" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Ubber_Pivot_3_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 24.9768,0L 24.9768,24.8578L 0,24.8578L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 24.8578,24.8579C 11.1292,24.8579 0,13.7287 0,3.05176e-005L 24.9768,3.05176e-005" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 24.8578,24.8579C 38.5864,24.8579 49.7156,13.7287 49.7156,3.05176e-005L 24.7388,3.05176e-005" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 24.8578,-24.8578C 38.5864,-24.8578 49.7156,-13.7286 49.7156,3.05176e-005L 24.7388,3.05176e-005" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 24.8578,-24.8578C 11.1292,-24.8578 0,-13.7286 0,3.05176e-005L 24.9768,3.05176e-005" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Ubber_Pivot_2_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 24.9768,0L 24.9768,24.8578L 0,24.8578L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 0.118958,24.8579C -13.6097,24.8579 -24.7389,13.7287 -24.7389,3.05176e-005L 0.237915,3.05176e-005" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 0.118896,24.8579C 13.8475,24.8579 24.9767,13.7287 24.9767,3.05176e-005L -6.10352e-005,3.05176e-005" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 0.118896,-24.8578C 13.8475,-24.8578 24.9767,-13.7286 24.9767,3.05176e-005L -6.10352e-005,3.05176e-005" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 0.118958,-24.8578C -13.6097,-24.8578 -24.7389,-13.7286 -24.7389,3.05176e-005L 0.237915,3.05176e-005" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Ubber_Pivot_1_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 24.9768,0L 24.9768,24.8578L 0,24.8578L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 0.118958,49.7157C -13.6097,49.7157 -24.7389,38.5865 -24.7389,24.8578L 0.237915,24.8578" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 0.118896,49.7157C 13.8475,49.7157 24.9767,38.5865 24.9767,24.8578L -6.10352e-005,24.8578" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 0.118896,0C 13.8475,0 24.9767,11.1292 24.9767,24.8578L -6.10352e-005,24.8578" /> - <GeometryDrawing Brush="#FF000000" Geometry="F1 M 0.118958,0C -13.6097,0 -24.7389,11.1292 -24.7389,24.8578L 0.237915,24.8578" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Player_3_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 69.8406,69.8394C 31.269,69.8394 0.000518799,38.571 0.000518799,-0.000671387L 70.1748,-0.000671387" /> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 69.8394,-69.8395C 108.411,-69.8395 139.679,-38.571 139.679,0.000610352L 69.5052,0.000610352" /> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 69.8406,-69.8395C 31.269,-69.8395 0.000518799,-38.571 0.000518799,0.000610352L 70.1748,0.000610352" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Player_2_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 0.333527,69.8394C 38.9052,69.8394 70.1736,38.571 70.1736,-0.000671387L -0.000610352,-0.000671387" /> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 0.333527,-69.8395C 38.9052,-69.8395 70.1736,-38.571 70.1736,0.000610352L -0.000610352,0.000610352" /> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 0.334778,-69.8395C -38.2369,-69.8395 -69.5053,-38.571 -69.5053,0.000610352L 0.668945,0.000610352" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Player_1_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 0.334778,139.679C -38.2369,139.679 -69.5053,108.411 -69.5053,69.8394L 0.668945,69.8394" /> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 0.333527,139.679C 38.9052,139.679 70.1736,108.411 70.1736,69.8394L -0.000610352,69.8394" /> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 0.333527,0.000518799C 38.9052,0.000518799 70.1736,31.269 70.1736,69.8407L -0.000610352,69.8407" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Player_4_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 69.8406,139.679C 31.269,139.679 0.000518799,108.411 0.000518799,69.8394L 70.1748,69.8394" /> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 69.8394,139.679C 108.411,139.679 139.679,108.411 139.679,69.8394L 69.5052,69.8394" /> - <GeometryDrawing Brush="#FF6D716D" Geometry="F1 M 69.8406,0.000518799C 31.269,0.000518799 0.000518799,31.269 0.000518799,69.8407L 70.1748,69.8407" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_1_#FFFF00_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FFFFFF00" Geometry="F1 M 69.8406,0.000564575C 31.269,0.000564575 0.000549316,31.2691 0.000549316,69.8407L 70.1748,69.8407" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_2_#FFC800_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FFFFC800" Geometry="F1 M 69.8406,0.000473022C 31.269,0.000473022 0.000488281,31.269 0.000488281,69.8406L 70.1748,69.8406" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_3_#FF7D00__xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FFFF7D00" Geometry="F1 M 69.8406,0.000564575C 31.269,0.000564575 0.000549316,31.2691 0.000549316,69.8407L 70.1748,69.8407" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_4_#FF0000_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FFFF0000" Geometry="F1 M 69.8406,0.000564575C 31.269,0.000564575 0.000549316,31.2691 0.000549316,69.8407L 70.1748,69.8407" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_5_#FF0064_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FFFF0064" Geometry="F1 M 69.8406,0.000564575C 31.269,0.000564575 0.000549316,31.2691 0.000549316,69.8407L 70.1747,69.8407" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_6_#C80FA0_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FFC80FA0" Geometry="F1 M 69.8406,0.000473022C 31.269,0.000473022 0.000549316,31.269 0.000549316,69.8406L 70.1748,69.8406" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_7_#5A0FC8_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF5A0FC8" Geometry="F1 M 69.8406,0.000564575C 31.269,0.000564575 0.000518799,31.2691 0.000518799,69.8407L 70.1747,69.8407" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_8_#230FD2_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF230FD2" Geometry="F1 M 69.8406,0.000473022C 31.269,0.000473022 0.000518799,31.269 0.000518799,69.8406L 70.1748,69.8406" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_9_#0096FF__xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF0096FF" Geometry="F1 M 69.8406,0.000473022C 31.269,0.000473022 0.000518799,31.269 0.000518799,69.8406L 70.1748,69.8406" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_10_#009664_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF009664" Geometry="F1 M 69.8406,0.000473022C 31.269,0.000473022 0.000534058,31.269 0.000534058,69.8406L 70.1748,69.8406" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_11_#006432_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF00C800" Geometry="F1 M -0.333618,0.000473022C -38.9053,0.000473022 -70.1737,31.269 -70.1737,69.8406L 0.000534058,69.8406" /> - <GeometryDrawing Brush="#FF006432" Geometry="F1 M 69.8406,0.000473022C 31.269,0.000473022 0.000534058,31.269 0.000534058,69.8406L 70.1748,69.8406" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> - <DrawingBrush x:Key="Color_12_#00C800_xaml" Stretch="Uniform"> - <DrawingBrush.Drawing> - <DrawingGroup ClipGeometry="F1 M 0,0L 70.1742,0L 70.1742,69.84L 0,69.84L 0,0"> - <DrawingGroup.Children> - <GeometryDrawing Brush="#FF00C800" Geometry="F1 M 69.8406,0.000473022C 31.269,0.000473022 0.000528336,31.269 0.000528336,69.8406L 70.1748,69.8406" /> - </DrawingGroup.Children> - </DrawingGroup> - </DrawingBrush.Drawing> - </DrawingBrush> -</ResourceDictionary> \ No newline at end of file
--- a/src/FingersDance/FingersDance.csproj Tue Sep 15 16:57:45 2009 +0200 +++ b/src/FingersDance/FingersDance.csproj Tue Sep 15 18:20:09 2009 +0200 @@ -129,10 +129,6 @@ <Resource Include="Resources\WindowBackground.jpg" /> </ItemGroup> <ItemGroup> - <Resource Include="FingersDance.Control.Pivot.Ressource.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Resource> <Page Include="MainSurfaceWindow.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -147,6 +143,10 @@ <Project>{0EC4C48C-132C-4926-9A09-A4135C58688C}</Project> <Name>FingersDance.Control.Pivot</Name> </ProjectReference> + <ProjectReference Include="..\FingersDance.Control.SessionInput\FingersDance.Control.SessionInput.csproj"> + <Project>{4C5C068F-7D41-4563-9109-7B57485F4BED}</Project> + <Name>FingersDance.Control.SessionInput</Name> + </ProjectReference> <ProjectReference Include="..\FingersDance.Control.UserPanel\FingersDance.Control.UserPanel.csproj"> <Project>{E6A3A067-1CB4-43D2-BB9C-DC72361F7E22}</Project> <Name>FingersDance.Control.UserPanel</Name>
--- a/src/FingersDance/MainSurfaceWindow.xaml Tue Sep 15 16:57:45 2009 +0200 +++ b/src/FingersDance/MainSurfaceWindow.xaml Tue Sep 15 18:20:09 2009 +0200 @@ -4,10 +4,17 @@ xmlns:s="http://schemas.microsoft.com/surface/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel;assembly=FingersDance.Control.UserPanel" + xmlns:FingersDance_Control_Pivot="clr-namespace:FingersDance.Control.Pivot;assembly=FingersDance.Control.Pivot" + xmlns:FingersDance_Control_SessionInput="clr-namespace:FingersDance.Control.SessionInput;assembly=FingersDance.Control.SessionInput" + + x:Class="FingersDance.SurfaceWindow1" Title="FingersDance" - Width="1024" Height="768" x:Name="mainSurfaceWindow" - xmlns:FingersDance_Control_Pivot="clr-namespace:FingersDance.Control.Pivot;assembly=FingersDance.Control.Pivot" Background="{x:Null}" + Width="1024" Height="768" x:Name="mainSurfaceWindow" + Background="{x:Null}" + xmlns:FingersDance_Control_SessionInput1="clr-namespace:FingersDance.Control.SessionInput;assembly=FingersDance.Control.SaisieSeance" + + > <s:SurfaceWindow.Resources> <ImageBrush x:Key="WindowBackground" Stretch="None" Opacity="0.6" ImageSource="pack://application:,,,/Resources/WindowBackground.jpg"/> @@ -68,5 +75,7 @@ </s:ScatterViewItem> </s:ScatterView> + <FingersDance_Control_SessionInput1:UserControlSessionInput HorizontalAlignment="Left" VerticalAlignment="Top"/> + </Grid> </s:SurfaceWindow>
