Fix for Windows 10

- if Hurricane is hidden, it doesn't appear in alt+tab - update cscore & json.net - remove unused library
Anapher · Sep 4, 2015 · 854250b · 854250b
1 parent ec55b94
commit 854250b
Show file tree

Hide file tree

Showing 85 changed files with 33,567 additions and 33,963 deletions.
diff --git a/Hurricane/AppMainWindow/WindowSkins/WindowAdvancedView.xaml b/Hurricane/AppMainWindow/WindowSkins/WindowAdvancedView.xaml
@@ -824,15 +824,10 @@
                                                             <DataTemplate DataType="{x:Type track:YouTubeTrack}">
                                                                 <Path Data="{Binding ProviderVector}" Fill="{StaticResource BlackBrush}" />
                                                             </DataTemplate>
-                                                            <DataTemplate DataType="{x:Type track:GroovesharkTrack}">
-                                                                <Path Data="{Binding ProviderVector}" Fill="{StaticResource BlackBrush}" />
-                                                            </DataTemplate>
                                                             <DataTemplate DataType="{x:Type track:CustomStream}">
                                                                 <Path Data="{Binding ProviderVector}" Fill="{StaticResource BlackBrush}" />
                                                             </DataTemplate>
-                                                            <DataTemplate DataType="{x:Type track:VkontakteTrack}">
-                                                                <Path Data="{Binding ProviderVector}" Fill="{StaticResource BlackBrush}" />
-                                                            </DataTemplate>
+
                                                         </ContentControl.Resources>
                                                     </ContentControl>
                                                 </Viewbox>

diff --git a/Hurricane/Hurricane.csproj b/Hurricane/Hurricane.csproj
@@ -56,9 +56,9 @@
     <StartupObject>Hurricane.App</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CSCore, Version=1.0.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Libraries\CSCore.dll</HintPath>
+    <Reference Include="CSCore, Version=1.1.5697.25221, Culture=neutral, PublicKeyToken=5a08f2b6f4415dea, processorArchitecture=MSIL">
+      <HintPath>..\packages\CSCore.1.1-alpha1\lib\net35-client\CSCore.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Exceptionless.Extras, Version=3.0.1319.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -82,19 +82,16 @@
     <Reference Include="Hardcodet.Wpf.TaskbarNotification">
       <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.5\lib\net45\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
     </Reference>
-    <Reference Include="HtmlAgilityPack">
-      <HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
-    </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="MahApps.Metro, Version=0.14.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libraries\MahApps.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -213,6 +210,7 @@
     <Compile Include="GUI\Controls\VolumeIcon.xaml.cs">
       <DependentUpon>VolumeIcon.xaml</DependentUpon>
     </Compile>
+    <Compile Include="MagicArrow\WindowHider.cs" />
     <Compile Include="Music\Download\DownloadSettings.cs" />
     <Compile Include="Music\Download\ffmpeg.cs" />
     <Compile Include="Music\Download\GroovesharkApi.cs" />
@@ -223,23 +221,9 @@
     <Compile Include="Music\AudioEngine\SoundOutManager.cs" />
     <Compile Include="Music\Proxy\HttpProxy.cs" />
     <Compile Include="Music\Proxy\ProxyEntry.cs" />
-    <Compile Include="Music\Track\GroovesharkTrack.cs" />
     <Compile Include="Music\Track\LocalTrackFragment.cs" />
     <Compile Include="Music\AudioEngine\CutSource.cs" />
     <Compile Include="Music\Track\CustomStream.cs" />
-    <Compile Include="Music\Track\VkontakteTrack.cs" />
-    <Compile Include="Music\Track\WebApi\GroovesharkApi\GroovesharkApi.cs" />
-    <Compile Include="Music\Track\WebApi\GroovesharkApi\GroovesharkWebTrackResult.cs" />
-    <Compile Include="Music\Track\WebApi\GroovesharkApi\SearchResult.cs" />
-    <Compile Include="Music\Track\WebApi\VkontakteApi\Settings.xaml.cs">
-      <DependentUpon>Settings.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Music\Track\WebApi\VkontakteApi\Audio.cs" />
-    <Compile Include="Music\Track\WebApi\VkontakteApi\CaptchaNeededException.cs" />
-    <Compile Include="Music\Track\WebApi\VkontakteApi\SearchResult.cs" />
-    <Compile Include="Music\Track\WebApi\VkontakteApi\VkAuthorization.cs" />
-    <Compile Include="Music\Track\WebApi\VkontakteApi\VkontakteApi.cs" />
-    <Compile Include="Music\Track\WebApi\VkontakteApi\VkontakteWebTrackResult.cs" />
     <Compile Include="Music\Track\WebApi\YouTubeApi\DataClasses\ContentSearchResult.cs" />
     <Compile Include="Music\Track\WebApi\YouTubeApi\DataClasses\IVideoInfo.cs" />
     <Compile Include="Music\Track\WebApi\YouTubeApi\DataClasses\PlaylistInfo\PlaylistInfo.cs" />
@@ -402,10 +386,6 @@
     <Compile Include="Utilities\StringExtensions.cs" />
     <Compile Include="Utilities\TaskExtensions.cs" />
     <Compile Include="Utilities\UIHelper.cs" />
-    <Compile Include="Utilities\Web\Cookies.cs" />
-    <Compile Include="Utilities\Web\WebCall.cs" />
-    <Compile Include="Utilities\Web\WebCallResult.cs" />
-    <Compile Include="Utilities\Web\WebForm.cs" />
     <Compile Include="Utilities\WindowHelper.cs" />
     <Compile Include="Utilities\WpfScreen.cs" />
     <Compile Include="ViewModels\MainViewModelCommands.cs" />
@@ -537,10 +517,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Music\Track\WebApi\VkontakteApi\Settings.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Notification\Views\NotificationRightBottomWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/Hurricane/MagicArrow/DockManager/DockRangeWindow.xaml b/Hurricane/MagicArrow/DockManager/DockRangeWindow.xaml
@@ -1,18 +1,27 @@
 <Window x:Class="Hurricane.MagicArrow.DockManager.DockRangeWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="DockRangeWindow" Height="300" Width="300" WindowStyle="None" ResizeMode="NoResize" AllowsTransparency="True" Background="{DynamicResource AccentColorBrush}" Opacity="0.25" ShowInTaskbar="False" ShowActivated="False">
+        Title="DockRangeWindow"
+        Width="300"
+        Height="300"
+        AllowsTransparency="True"
+        Background="{DynamicResource AccentColorBrush}"
+        Opacity="0.25"
+        ResizeMode="NoResize"
+        ShowActivated="False"
+        ShowInTaskbar="False"
+        WindowStyle="None">
     <Window.Triggers>
         <EventTrigger RoutedEvent="Window.Loaded">
             <BeginStoryboard>
                 <Storyboard>
-                    <DoubleAnimation
-        From="0" To=".1" Duration="0:0:0.1" Storyboard.TargetProperty="Opacity" />
+                    <DoubleAnimation Duration="0:0:0.1"
+                                     From="0"
+                                     Storyboard.TargetProperty="Opacity"
+                                     To=".1" />
                 </Storyboard>
             </BeginStoryboard>
         </EventTrigger>
     </Window.Triggers>
-    <Grid>
-
-    </Grid>
+    <Grid />
 </Window>