Updated splash screen to use new logo

6 files changed, 12 insertions, 23 deletions

diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 51d24e2a1..20acef402 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -128,10 +128,11 @@
     <EmbeddedResource Include="Properties\Resources.resx">

       <Generator>ResXFileCodeGenerator</Generator>

       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

+      <SubType>Designer</SubType>

     </EmbeddedResource>

   </ItemGroup>

   <ItemGroup>

-    <Resource Include="Resources\mblogo1000.png" />

+    <Resource Include="Resources\mblogo.png" />

   </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/MediaBrowser.Common/Properties/Resources.Designer.cs b/MediaBrowser.Common/Properties/Resources.Designer.cs
index 727c195d2..f39a1c1d9 100644
--- a/MediaBrowser.Common/Properties/Resources.Designer.cs
+++ b/MediaBrowser.Common/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:4.0.30319.17626

+//     Runtime Version:4.0.30319.17929

 //

 //     Changes to this file may cause incorrect behavior and will be lost if

 //     the code is regenerated.

@@ -59,15 +59,5 @@ namespace MediaBrowser.Common.Properties {
                 resourceCulture = value;

             }

         }

-        

-        /// <summary>

-        ///   Looks up a localized resource of type System.Drawing.Bitmap.

-        /// </summary>

-        internal static System.Drawing.Bitmap mblogo1000 {

-            get {

-                object obj = ResourceManager.GetObject("mblogo1000", resourceCulture);

-                return ((System.Drawing.Bitmap)(obj));

-            }

-        }

     }

 }

diff --git a/MediaBrowser.Common/Properties/Resources.resx b/MediaBrowser.Common/Properties/Resources.resx
index 23dea88cb..7c0911ec1 100644
--- a/MediaBrowser.Common/Properties/Resources.resx
+++ b/MediaBrowser.Common/Properties/Resources.resx
@@ -118,7 +118,4 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

-  <data name="mblogo1000" type="System.Resources.ResXFileRef, System.Windows.Forms">

-    <value>..\Resources\mblogo1000.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

-  </data>

 </root>
\ No newline at end of file
diff --git a/MediaBrowser.Common/Resources/mblogo.png b/MediaBrowser.Common/Resources/mblogo.png
new file mode 100644
index 000000000..3b86a12af
--- /dev/null
+++ b/MediaBrowser.Common/Resources/mblogo.png
diff --git a/MediaBrowser.Common/Resources/mblogo1000.png b/MediaBrowser.Common/Resources/mblogo1000.png
deleted file mode 100644
index a6ae07abf..000000000
--- a/MediaBrowser.Common/Resources/mblogo1000.png
+++ /dev/null
diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
index cc1881b73..c0a37d538 100644
--- a/MediaBrowser.Common/UI/Splash.xaml
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -3,21 +3,22 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

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

         Title="MediaBrowser" 

-        Height="346" 

-        Width="600" 

+        Height="280" 

+        Width="520" 

         ShowInTaskbar="True" 

         ResizeMode="NoResize" 

         WindowStartupLocation="CenterScreen"

-        WindowState="Normal">

+        WindowState="Normal" 

+        FontSize="14">

     <Window.Background>

         <RadialGradientBrush>

-            <GradientStop Color="Black" Offset="1"/>

-            <GradientStop Color="#333333"/>

+            <GradientStop Color="#f8f8f8" Offset="1"/>

+            <GradientStop Color="#ffffff"/>

         </RadialGradientBrush>

     </Window.Background>

     <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"/>

+        <Image HorizontalAlignment="Left" VerticalAlignment="Top" Source="/MediaBrowser.Common;component/Resources/mblogo.png" Stretch="Uniform" Grid.Row="0" Margin="10 10 10 10"/>

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

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

     </Grid>

 </Controls:MetroWindow>