From a129c93c42ee02aa7ecdb9227552d18eac034b98 Mon Sep 17 00:00:00 2001
From: RedShirtMB Mark Linton redshirt linton
 <RedShirtMB Mark Linton redshirt.linton@gmail.com>
Date: Sun, 19 Aug 2012 11:01:43 -0700
Subject: Updated splashscreen to report progress Added default image (need to
 change later)

---
 MediaBrowser.Common/UI/Splash.xaml    | 10 ++++++----
 MediaBrowser.Common/UI/Splash.xaml.cs | 11 ++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Common/UI')

diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
index 9bf1c8364c..3927017f9c 100644
--- a/MediaBrowser.Common/UI/Splash.xaml
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -1,9 +1,11 @@
 <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>
-        
+        Title="SplashScreen" Height="346" Width="600" ShowInTaskbar="False" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
+        WindowState="Normal" WindowStyle="SingleBorderWindow" Background="Black">
+    <Grid Name="splashGrid">
+        <Image HorizontalAlignment="Left" Height="213" Margin="10,10,0,0" VerticalAlignment="Top" Width="574" Source="/MediaBrowser.Common;component/Resources/mblogo1000.png" Stretch="Fill"/>
+        <ProgressBar Name="pbProgress" Minimum="0" Maximum="100" HorizontalAlignment="Left" Height="24" Margin="10,242,0,0" VerticalAlignment="Top" Width="574"/>
+        <Label Name="lblProgress" Content="Label" HorizontalAlignment="Left" Margin="10,282,0,0" VerticalAlignment="Top" Width="574" Foreground="White"/>
     </Grid>
 </Window>
diff --git a/MediaBrowser.Common/UI/Splash.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs
index e136baa191..6d1d313e81 100644
--- a/MediaBrowser.Common/UI/Splash.xaml.cs
+++ b/MediaBrowser.Common/UI/Splash.xaml.cs
@@ -21,9 +21,18 @@ namespace MediaBrowser.Common.UI
     /// </summary>
     public partial class Splash : Window
     {
-        public Splash(IProgress<TaskProgress> progress)
+
+        public Splash(Progress<TaskProgress> progress)
         {
             InitializeComponent();
+            
+            progress.ProgressChanged += progress_ProgressChanged;
+        }
+
+        void progress_ProgressChanged(object sender, TaskProgress e)
+        {
+            this.lblProgress.Content = e.Description;
+            this.pbProgress.Value = (double)e.PercentComplete;
         }
     }
 }
-- 
cgit v1.2.3