Moved splashscreen to MediaBrowser.Common and adjusted properties.

4 files changed, 2 insertions, 45 deletions

diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index 7b6932848..ee473bbc0 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
@@ -13,6 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;

 using System.Windows.Shapes;

 

+using MediaBrowser.Common;

 using MediaBrowser.Controller;

 using MediaBrowser.Model.Progress;

 

@@ -32,7 +33,7 @@ namespace MediaBrowser.ServerApplication
         private void LoadKernel()

         {

             Progress<TaskProgress> progress = new Progress<TaskProgress>();

-            SplashScreen splash = new SplashScreen(progress);

+            Common.UI.Splash splash = new Common.UI.Splash(progress);

 

             try

             {

diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 355a421c4..cb98583e2 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -56,9 +56,6 @@
       <Generator>MSBuild:Compile</Generator>

       <SubType>Designer</SubType>

     </ApplicationDefinition>

-    <Compile Include="SplashScreen.xaml.cs">

-      <DependentUpon>SplashScreen.xaml</DependentUpon>

-    </Compile>

     <Page Include="MainWindow.xaml">

       <Generator>MSBuild:Compile</Generator>

       <SubType>Designer</SubType>

@@ -71,10 +68,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>

       <SubType>Code</SubType>

     </Compile>

-    <Page Include="SplashScreen.xaml">

-      <SubType>Designer</SubType>

-      <Generator>MSBuild:Compile</Generator>

-    </Page>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/MediaBrowser.ServerApplication/SplashScreen.xaml b/MediaBrowser.ServerApplication/SplashScreen.xaml
deleted file mode 100644
index c5dcbab61..000000000
--- a/MediaBrowser.ServerApplication/SplashScreen.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Window x:Class="MediaBrowser.ServerApplication.SplashScreen"

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

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

-        Title="SplashScreen" Height="300" Width="600">

-    <Grid>

-        

-    </Grid>

-</Window>

diff --git a/MediaBrowser.ServerApplication/SplashScreen.xaml.cs b/MediaBrowser.ServerApplication/SplashScreen.xaml.cs
deleted file mode 100644
index 03bfb8eab..000000000
--- a/MediaBrowser.ServerApplication/SplashScreen.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Threading.Tasks;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Shapes;

-

-using MediaBrowser.Model.Progress;

-

-namespace MediaBrowser.ServerApplication

-{

-    /// <summary>

-    /// Interaction logic for SplashScreen.xaml

-    /// </summary>

-    public partial class SplashScreen : Window

-    {

-        public SplashScreen(IProgress<TaskProgress> progress)

-        {

-            InitializeComponent();

-        }

-    }

-}