Mercurial Mercurial > fingersdance / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debug for video path
authorcavaliet
Mon, 14 Sep 2009 15:53:57 +0200
changeset 49 b23aa9d09ac1
parent 48 50f075139497
child 50 55c8b9efaa26
debug for video path
src/FingersDance.Control.Player/FingersDance.Control.Player.csproj file | annotate | diff | comparison | revisions
src/FingersDance.Control.Player/UserControlPlayer.xaml.cs file | annotate | diff | comparison | revisions
src/FingersDance.sln file | annotate | diff | comparison | revisions
src/FingersDance/FingersDance.csproj file | annotate | diff | comparison | revisions
src/FingersDance/FingersDance.xml file | annotate | diff | comparison | revisions
test/Control.UserPanel.Test/Control.UserPanel.Test/Control.UserPanel.Test.csproj file | annotate | diff | comparison | revisions
test/Control.UserPanel.Test/Control.UserPanel.Test/SurfaceWindow1.xaml file | annotate | diff | comparison | revisions 
--- a/src/FingersDance.Control.Player/FingersDance.Control.Player.csproj	Sun Sep 13 12:23:40 2009 +0200
+++ b/src/FingersDance.Control.Player/FingersDance.Control.Player.csproj	Mon Sep 14 15:53:57 2009 +0200
@@ -133,9 +133,9 @@
     <Content Include="Resources\iconPreview.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\Lake.wmv">
+    <Resource Include="Resources\Lake.wmv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </Resource>
     <Resource Include="Resources\SurfaceWindow1Background.jpg" />
   </ItemGroup>
   <ItemGroup>
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs	Sun Sep 13 12:23:40 2009 +0200
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs	Mon Sep 14 15:53:57 2009 +0200
@@ -9,6 +9,7 @@
 using System.Windows.Media.Animation;
 using System.Windows.Navigation;
 using System.ComponentModel;
+using System.Reflection;
 
 namespace FingersDance.Control.Player
 {
@@ -55,8 +56,10 @@
             //init player
             isPlaying = false;
             //Pour se diriger vers le Dossier ressources du projet et non le bin/ressources
-            DirectoryInfo info = Directory.GetParent(@".");
-            MediaElementVideo.Source = new Uri(@"" + info.Parent.FullName.ToString() + "\\Resources\\Lake.wmv", UriKind.Relative);
+            //DirectoryInfo info = Directory.GetParent(@".");
+            FileInfo assemblyPath = new FileInfo(Assembly.GetExecutingAssembly().Location);
+            DirectoryInfo info = assemblyPath.Directory;
+            MediaElementVideo.Source = new Uri(@"" + info.FullName.ToString() + "\\Resources\\Lake.wmv", UriKind.Relative);
             MediaElementVideo.LoadedBehavior = MediaState.Manual;
             MediaElementVideo.UnloadedBehavior = MediaState.Manual;
             MediaElementVideo.ScrubbingEnabled= true;
--- a/src/FingersDance.sln	Sun Sep 13 12:23:40 2009 +0200
+++ b/src/FingersDance.sln	Mon Sep 14 15:53:57 2009 +0200
@@ -27,6 +27,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Debug", "FingersDance.Debug\FingersDance.Debug.csproj", "{148FE4AA-2C30-4D08-9291-BF22023F0AAA}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{C31FBAA9-272D-49FA-A058-0C01A49A0A33}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -131,6 +133,10 @@
 		{148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{C31FBAA9-272D-49FA-A058-0C01A49A0A33}.Debug|Any CPU.ActiveCfg = Debug
+		{C31FBAA9-272D-49FA-A058-0C01A49A0A33}.Debug|x86.ActiveCfg = Debug
+		{C31FBAA9-272D-49FA-A058-0C01A49A0A33}.Release|Any CPU.ActiveCfg = Release
+		{C31FBAA9-272D-49FA-A058-0C01A49A0A33}.Release|x86.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/FingersDance/FingersDance.csproj	Sun Sep 13 12:23:40 2009 +0200
+++ b/src/FingersDance/FingersDance.csproj	Mon Sep 14 15:53:57 2009 +0200
@@ -117,7 +117,9 @@
     <Content Include="Resources\iconPreview.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\Lake.wmv" />
+    <Content Include="Resources\Lake.wmv">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Resource Include="FingersDance.xml" />
   </ItemGroup>
   <ItemGroup>
--- a/src/FingersDance/FingersDance.xml	Sun Sep 13 12:23:40 2009 +0200
+++ b/src/FingersDance/FingersDance.xml	Mon Sep 14 15:53:57 2009 +0200
@@ -11,7 +11,7 @@
   <Application>
     <Title>FingersDance</Title>
     <Description>FingersDance</Description>
-    <ExecutableFile>FingersDance.exe</ExecutableFile>
+    <ExecutableFile>%ProgramFiles%\Microsoft Surface\FingersDance\FingersDance.exe</ExecutableFile>
     <Arguments></Arguments>
     <IconImageFile>Resources\icon.png</IconImageFile>
     <Preview>
--- a/test/Control.UserPanel.Test/Control.UserPanel.Test/Control.UserPanel.Test.csproj	Sun Sep 13 12:23:40 2009 +0200
+++ b/test/Control.UserPanel.Test/Control.UserPanel.Test/Control.UserPanel.Test.csproj	Mon Sep 14 15:53:57 2009 +0200
@@ -100,7 +100,9 @@
     <Content Include="Resources\iconPreview.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\Lake.wmv" />
+    <Content Include="Resources\Lake.wmv">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Resource Include="Control.UserPanel.Test.xml" />
   </ItemGroup>
   <ItemGroup>
--- a/test/Control.UserPanel.Test/Control.UserPanel.Test/SurfaceWindow1.xaml	Sun Sep 13 12:23:40 2009 +0200
+++ b/test/Control.UserPanel.Test/Control.UserPanel.Test/SurfaceWindow1.xaml	Mon Sep 14 15:53:57 2009 +0200
@@ -14,9 +14,8 @@
     <ImageBrush x:Key="WindowBackground" Stretch="None" Opacity="0.6" ImageSource="pack://application:,,,/Resources/WindowBackground.jpg"/>
   </s:SurfaceWindow.Resources>
 
-  <Grid Background="{StaticResource WindowBackground}" Height="768" Width="1024">
-  	<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserControlUserPanel1" d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Height="286.724" HorizontalAlignment="Left" VerticalAlignment="Top" Width="331.733" />
-<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserControlUserPanel2" Margin="15.003,288.391,325.065,56.678" d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" />
+  <Grid Background="{StaticResource WindowBackground}">
+  	<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserControlUserPanel1" Margin="0,0,-8,-30" />
 
   </Grid>
 </s:SurfaceWindow>
fingersdance