From e4b0eb5779d56b3d494bf5792f0058853b3b1df3 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Sun, 2 Sep 2012 16:24:10 -0400
Subject: Added taskbar icon and standardized locations of images

---
 MediaBrowser.Common/UI/BaseApplication.cs | 13 -------------
 MediaBrowser.Common/UI/Splash.xaml        |  9 +++++----
 MediaBrowser.Common/UI/Splash.xaml.cs     |  2 --
 3 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'MediaBrowser.Common/UI')

diff --git a/MediaBrowser.Common/UI/BaseApplication.cs b/MediaBrowser.Common/UI/BaseApplication.cs
index 2112be6792..a45faca503 100644
--- a/MediaBrowser.Common/UI/BaseApplication.cs
+++ b/MediaBrowser.Common/UI/BaseApplication.cs
@@ -68,18 +68,5 @@ namespace MediaBrowser.Common.UI
 
             Kernel.Dispose();
         }
-
-        public BitmapImage GetLogoImage()
-        {
-            BitmapImage bitmap = new BitmapImage();
-
-            bitmap.CacheOption = BitmapCacheOption.Default;
-
-            bitmap.BeginInit();
-            bitmap.StreamSource = Assembly.GetExecutingAssembly().GetManifestResourceStream("MediaBrowser.Common.Resources.mblogo.png");
-            bitmap.EndInit();
-
-            return bitmap;
-        }
     }
 }
diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
index 56c2957311..4d5c2717cc 100644
--- a/MediaBrowser.Common/UI/Splash.xaml
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -11,13 +11,14 @@
         WindowState="Normal" 
         FontSize="14">
     <Window.Background>
-        <RadialGradientBrush>
-            <GradientStop Color="#ffffff" Offset="1"/>
-            <GradientStop Color="#f8f8f8"/>
+        <RadialGradientBrush RadiusX=".75" RadiusY=".75">
+            <GradientStop Color="White" Offset="0.0"/>
+            <GradientStop Color="WhiteSmoke" Offset="0.65"/>
+            <GradientStop Color="#cfcfcf" Offset="1.0"/>
         </RadialGradientBrush>
     </Window.Background>
     <Grid Name="splashGrid">
-        <Image x:Name="imgLogo" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" Grid.Row="0" Margin="10 10 10 10"/>
+        <Image x:Name="imgLogo" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" Grid.Row="0" Margin="10 10 10 10" Source="../Resources/Images/mblogoblack.png"/>
         <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>
diff --git a/MediaBrowser.Common/UI/Splash.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs
index edfacf0167..f66f9ec8fc 100644
--- a/MediaBrowser.Common/UI/Splash.xaml.cs
+++ b/MediaBrowser.Common/UI/Splash.xaml.cs
@@ -35,8 +35,6 @@ namespace MediaBrowser.Common.UI
         {
             // Setting this in markup throws an exception at runtime
             ShowTitleBar = false;
-
-            imgLogo.Source = (Application.Current as BaseApplication).GetLogoImage();
         }
     }
 }
-- 
cgit v1.2.3