diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index f7ccc17786..bd5e8b7332 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -67,6 +67,11 @@
+
+ True
+ True
+ Resources.resx
+
@@ -104,7 +109,15 @@
MSBuild:Compile
-
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ ..\Resources\mblogo1000.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Common/Resources/mblogo1000.png b/MediaBrowser.Common/Resources/mblogo1000.png
new file mode 100644
index 0000000000..a6ae07abfb
Binary files /dev/null and b/MediaBrowser.Common/Resources/mblogo1000.png differ
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 @@
-
-
+ Title="SplashScreen" Height="346" Width="600" ShowInTaskbar="False" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
+ WindowState="Normal" WindowStyle="SingleBorderWindow" Background="Black">
+
+
+
+
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
///
public partial class Splash : Window
{
- public Splash(IProgress progress)
+
+ public Splash(Progress progress)
{
InitializeComponent();
+
+ progress.ProgressChanged += progress_ProgressChanged;
+ }
+
+ void progress_ProgressChanged(object sender, TaskProgress e)
+ {
+ this.lblProgress.Content = e.Description;
+ this.pbProgress.Value = (double)e.PercentComplete;
}
}
}
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index b376858127..0c659f473d 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -76,7 +76,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(Performance) = preSolution
- HasPerformanceSessions = true
- EndGlobalSection
EndGlobal