Added MahApps.Metro

5 files changed, 25 insertions, 9 deletions

diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index d1f318ab4..51d24e2a1 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -31,6 +31,9 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="MahApps.Metro">

+      <HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\MahApps.Metro.dll</HintPath>

+    </Reference>

     <Reference Include="PresentationCore" />

     <Reference Include="PresentationFramework" />

     <Reference Include="protobuf-net">

@@ -58,6 +61,9 @@
       <HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>

     </Reference>

     <Reference Include="System.Runtime.Remoting" />

+    <Reference Include="System.Windows.Interactivity">

+      <HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\System.Windows.Interactivity.dll</HintPath>

+    </Reference>

     <Reference Include="System.Xaml" />

     <Reference Include="System.Xml.Linq" />

     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
index b02863f41..8bb6d0aca 100644
--- a/MediaBrowser.Common/UI/Splash.xaml
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -1,11 +1,19 @@
-<Window x:Class="MediaBrowser.Common.UI.Splash"

+<Controls:MetroWindow x:Class="MediaBrowser.Common.UI.Splash"

         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-        Title="MediaBrowser" Height="346" Width="600" ShowInTaskbar="True" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"

-        WindowState="Normal" WindowStyle="SingleBorderWindow" Background="Black" Loaded="Splash_Loaded">

+        xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"

+        Title="MediaBrowser" 

+        Height="346" 

+        Width="600" 

+        ShowInTaskbar="True" 

+        ResizeMode="NoResize" 

+        WindowStartupLocation="CenterScreen"

+        WindowState="Normal" 

+        Background="Black">

+    

     <Grid Name="splashGrid">

         <Image HorizontalAlignment="Left" VerticalAlignment="Top" Height="225" Source="/MediaBrowser.Common;component/Resources/mblogo1000.png" Stretch="Fill" Grid.Row="0"/>

         <ProgressBar Name="pbProgress" Minimum="0" Maximum="100" HorizontalAlignment="Left" Height="24" Margin="30,150,30,0" Width="540" Grid.Row="1"/>

         <Label Name="lblProgress" Content="Label" Margin="0,240,10,0" VerticalContentAlignment="Center" HorizontalAlignment="Center" Foreground="White" Grid.Row="2"/>

     </Grid>

-</Window>

+</Controls:MetroWindow>

diff --git a/MediaBrowser.Common/UI/Splash.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs
index 504179291..1fd66bda4 100644
--- a/MediaBrowser.Common/UI/Splash.xaml.cs
+++ b/MediaBrowser.Common/UI/Splash.xaml.cs
@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;

 using System.Windows;

 using System.Windows.Interop;

+using MahApps.Metro.Controls;

 using MediaBrowser.Common.Logging;

 using MediaBrowser.Model.Progress;

 

@@ -10,7 +11,7 @@ namespace MediaBrowser.Common.UI
     /// <summary>

     /// Interaction logic for Splash.xaml

     /// </summary>

-    public partial class Splash : Window

+    public partial class Splash : MetroWindow

     {

         private const int GWL_STYLE = -16;

         private const int WS_SYSMENU = 0x80000;

@@ -19,12 +20,12 @@ namespace MediaBrowser.Common.UI
         [DllImport("user32.dll")]

         private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);

 

-

         public Splash(Progress<TaskProgress> progress)

         {

             InitializeComponent();

             

             progress.ProgressChanged += progress_ProgressChanged;

+            Loaded+=Splash_Loaded;

         }

 

         void progress_ProgressChanged(object sender, TaskProgress e)

@@ -43,6 +44,9 @@ namespace MediaBrowser.Common.UI
         {

             var hwnd = new WindowInteropHelper(this).Handle;

             SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_SYSMENU);

+

+            // Setting this in markup throws an exception at runtime

+            ShowTitleBar = false;

         }

     }

 }

diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config
index 96da7ddad..3b8aa6748 100644
--- a/MediaBrowser.Common/packages.config
+++ b/MediaBrowser.Common/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

+  <package id="MahApps.Metro" version="0.9.0.0" targetFramework="net45" />

   <package id="protobuf-net" version="2.0.0.480" targetFramework="net45" />

   <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />

   <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />

diff --git a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
index 4da83a8cc..516486bd5 100644
--- a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
@@ -2,10 +2,7 @@
 using System.Collections.Generic;

 using System.ComponentModel.Composition;

 using System.Linq;

-using System.Threading.Tasks;

-using MediaBrowser.Common.Logging;

 using MediaBrowser.Controller.FFMpeg;

-using MediaBrowser.Controller.Library;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Controller.Providers