From 9b89a174991cd181b8915e7646e5add69e818b1d Mon Sep 17 00:00:00 2001 From: Patrick Hollweck Date: Wed, 10 May 2017 16:36:29 +0200 Subject: [PATCH 1/2] Installed CefSharp.WPF a better wpf webbrowser and updated some libs --- src/AstroSoundBoard/packages.config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/AstroSoundBoard/packages.config b/src/AstroSoundBoard/packages.config index 9ee0a50..3ced90a 100644 --- a/src/AstroSoundBoard/packages.config +++ b/src/AstroSoundBoard/packages.config @@ -1,8 +1,11 @@  + + + + - @@ -15,5 +18,4 @@ - \ No newline at end of file From 34669a634ab15c67f20a70a0007748ad98631a9c Mon Sep 17 00:00:00 2001 From: Patrick Hollweck Date: Wed, 10 May 2017 17:24:10 +0200 Subject: [PATCH 2/2] Fixed video not loading bug --- AstroSoundBoard.sln | 14 ++- src/AstroSoundBoard/AstroSoundBoard.csproj | 61 +++++++++- .../WPF/Windows/InfoWindow.xaml | 112 +++++++++--------- .../WPF/Windows/InfoWindow.xaml.cs | 7 -- src/AstroSoundBoard/packages.config | 2 + 5 files changed, 125 insertions(+), 71 deletions(-) diff --git a/AstroSoundBoard.sln b/AstroSoundBoard.sln index 8800e49..dd09174 100644 --- a/AstroSoundBoard.sln +++ b/AstroSoundBoard.sln @@ -8,19 +8,25 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x86.ActiveCfg = Debug|Any CPU - {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x86.Build.0 = Debug|Any CPU + {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x64.ActiveCfg = Debug|x64 + {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x64.Build.0 = Debug|x64 + {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x86.ActiveCfg = Debug|x86 + {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x86.Build.0 = Debug|x86 {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|Any CPU.ActiveCfg = Release|Any CPU {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|Any CPU.Build.0 = Release|Any CPU - {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x86.ActiveCfg = Release|Any CPU - {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x86.Build.0 = Release|Any CPU + {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x64.ActiveCfg = Release|Any CPU + {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x64.Build.0 = Release|Any CPU + {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x86.ActiveCfg = Release|x86 + {24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/AstroSoundBoard/AstroSoundBoard.csproj b/src/AstroSoundBoard/AstroSoundBoard.csproj index e4ff246..53189a9 100644 --- a/src/AstroSoundBoard/AstroSoundBoard.csproj +++ b/src/AstroSoundBoard/AstroSoundBoard.csproj @@ -1,5 +1,7 @@  + + Debug @@ -61,6 +63,46 @@ true + + true + bin\x64\Debug\ + DEBUG + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x86\Debug\ + DEBUG + full + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + ..\..\packages\Autoupdater.NET.Official.1.4\lib\net40\AutoUpdater.NET.dll @@ -92,8 +134,9 @@ - - ..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll + + ..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll + True @@ -469,8 +512,18 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + + + + + + + - + + + + + \ No newline at end of file diff --git a/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml b/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml index a245bec..f77820e 100644 --- a/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml +++ b/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml @@ -1,23 +1,23 @@  + x:Class="AstroSoundBoard.WPF.Windows.InfoWindow" + 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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:wpf="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf" + Title="Sound Info" + Width="800" + Height="470" + MinWidth="800" + MinHeight="470" + Background="{DynamicResource MaterialDesignPaper}" + FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto" + ResizeMode="NoResize" + TextElement.FontSize="14" + TextElement.FontWeight="Medium" + TextElement.Foreground="{DynamicResource MaterialDesignBody}" + mc:Ignorable="d"> @@ -32,65 +32,65 @@ + Grid.Row="0" + Grid.Column="1" + Grid.ColumnSpan="2" + Margin="16,16,16,0" + BorderThickness="0" + Header="{Binding LocalSound.Name, FallbackValue=SoundName}" + Style="{DynamicResource MaterialDesignGroupBox}" /> + Grid.Row="1" + Grid.Column="1" + Margin="16,0,16,16" + Header="Informations" + Style="{DynamicResource MaterialDesignCardGroupBox}"> + Width="32" + Height="32" + VerticalAlignment="Center" + Kind="Information" /> + Margin="8,0,0,0" + VerticalAlignment="Center" + Style="{StaticResource MaterialDesignSubheadingTextBlock}" + Text="{Binding}" /> + Margin="4" + Text="{Binding LocalSound.Description}" + TextWrapping="Wrap" /> + Grid.Row="1" + Grid.Column="2" + Margin="16,0,16,16" + Header="Video Source" + Style="{DynamicResource MaterialDesignCardGroupBox}"> + Width="32" + Height="32" + VerticalAlignment="Center" + Kind="Filmstrip" /> + Margin="8,0,0,0" + VerticalAlignment="Center" + Style="{StaticResource MaterialDesignSubheadingTextBlock}" + Text="{Binding}" /> - + diff --git a/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml.cs b/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml.cs index 37453cc..ce3b8b9 100644 --- a/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml.cs +++ b/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml.cs @@ -26,13 +26,6 @@ public InfoWindow(Sound def) InitializeComponent(); DataContext = this; - Browser.Navigate(LocalSound.VideoLink); - } - - private void Window_Closing(object sender, CancelEventArgs e) - { - // Needed to stop the Video if it is playing! - Browser.Dispose(); } } } \ No newline at end of file diff --git a/src/AstroSoundBoard/packages.config b/src/AstroSoundBoard/packages.config index 3ced90a..d5c7914 100644 --- a/src/AstroSoundBoard/packages.config +++ b/src/AstroSoundBoard/packages.config @@ -6,6 +6,7 @@ + @@ -18,4 +19,5 @@ + \ No newline at end of file