From dafa97333cb5950c87fb7be10a39bf2e917da923 Mon Sep 17 00:00:00 2001
From: RedShirtMB Mark Linton redshirt linton
 <RedShirtMB Mark Linton redshirt.linton@gmail.com>
Date: Sat, 4 Aug 2012 19:21:38 -0700
Subject: [PATCH] Moved splashscreen to MediaBrowser.Common and adjusted
 properties.

---
 MediaBrowser.Common/MediaBrowser.Common.csproj     | 14 +++++++++++++-
 MediaBrowser.Common/UI/Splash.xaml                 |  9 +++++++++
 .../UI/Splash.xaml.cs                              |  8 ++++----
 MediaBrowser.ServerApplication/MainWindow.xaml.cs  |  3 ++-
 .../MediaBrowser.ServerApplication.csproj          |  7 -------
 MediaBrowser.ServerApplication/SplashScreen.xaml   |  8 --------
 6 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 MediaBrowser.Common/UI/Splash.xaml
 rename MediaBrowser.ServerApplication/SplashScreen.xaml.cs => MediaBrowser.Common/UI/Splash.xaml.cs (68%)
 delete mode 100644 MediaBrowser.ServerApplication/SplashScreen.xaml

diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index a1fbdf6b89..7017b9b57d 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -31,6 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="ServiceStack.Text, Version=3.9.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\ServiceStack.Text.3.9.3\lib\net35\ServiceStack.Text.dll</HintPath>
@@ -43,11 +45,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Rx-Main.1.0.11226\lib\Net4\System.Reactive.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\ApplicationPaths.cs" />
@@ -71,6 +75,9 @@
     <Compile Include="Net\StreamExtensions.cs" />
     <Compile Include="Plugins\BasePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UI\Splash.xaml.cs">
+      <DependentUpon>Splash.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -81,7 +88,12 @@
       <Name>MediaBrowser.Model</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Page Include="UI\Splash.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
new file mode 100644
index 0000000000..9bf1c8364c
--- /dev/null
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -0,0 +1,9 @@
+<Window 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="SplashScreen" Height="300" Width="600" ShowInTaskbar="False" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
+        WindowState="Normal" WindowStyle="None" Background="White" AllowsTransparency="True">
+    <Grid>
+        
+    </Grid>
+</Window>
diff --git a/MediaBrowser.ServerApplication/SplashScreen.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs
similarity index 68%
rename from MediaBrowser.ServerApplication/SplashScreen.xaml.cs
rename to MediaBrowser.Common/UI/Splash.xaml.cs
index 03bfb8eab9..e136baa191 100644
--- a/MediaBrowser.ServerApplication/SplashScreen.xaml.cs
+++ b/MediaBrowser.Common/UI/Splash.xaml.cs
@@ -14,14 +14,14 @@ using System.Windows.Shapes;
 
 using MediaBrowser.Model.Progress;
 
-namespace MediaBrowser.ServerApplication
+namespace MediaBrowser.Common.UI
 {
     /// <summary>
-    /// Interaction logic for SplashScreen.xaml
+    /// Interaction logic for Splash.xaml
     /// </summary>
-    public partial class SplashScreen : Window
+    public partial class Splash : Window
     {
-        public SplashScreen(IProgress<TaskProgress> progress)
+        public Splash(IProgress<TaskProgress> progress)
         {
             InitializeComponent();
         }
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index 7b69328487..ee473bbc09 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 355a421c4c..cb98583e22 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 c5dcbab619..0000000000
--- 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>