2
0
Eric Reed 12 жил өмнө
parent
commit
bc03765275

+ 1 - 1
MediaBrowser.ServerApplication/ApplicationHost.cs

@@ -176,7 +176,7 @@ namespace MediaBrowser.ServerApplication
         /// <returns>Task.</returns>
         public override async Task Init()
         {
-            var win = new SplashWindow();
+            var win = new SplashWindow(ApplicationVersion);
 
             win.Show();
 

+ 1 - 0
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj

@@ -376,6 +376,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\Images\mb3logo800.png" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

BIN
MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png


+ 12 - 4
MediaBrowser.ServerApplication/Splash/SplashWindow.xaml

@@ -1,8 +1,16 @@
 <Window x:Class="MediaBrowser.ServerApplication.Splash.SplashWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Height="300" Width="400" WindowStartupLocation="CenterScreen" Title="Media Browser Server" ShowInTaskbar="True" WindowStyle="None" BorderThickness="1" BorderBrush="#cccccc" AllowsTransparency="True">
-    <Grid>
-        <TextBlock>Loading</TextBlock>
-    </Grid>
+        Height="386.939" Width="664.49" WindowStartupLocation="CenterScreen" Title="Media Browser Server" ShowInTaskbar="True" WindowStyle="None" BorderThickness="1" BorderBrush="#cccccc" AllowsTransparency="True">
+    <Border BorderBrush="DarkGray" BorderThickness="2" Margin="0,0,0,0">
+        <Grid Margin="-2,0,0,0">
+            <Image x:Name="imgLogo" HorizontalAlignment="Center" Height="146" Margin="0,10,44,0" VerticalAlignment="Top" Width="616" Source="/Resources/Images/mb3logo800.png" Opacity="0.5"/>
+            <Grid HorizontalAlignment="Left" Height="153" Margin="0,173,0,0" VerticalAlignment="Top" Width="662" Background="Gray">
+                <TextBlock x:Name="lblStatus" HorizontalAlignment="Left" Margin="12,14,0,18" Width="637" FontSize="36" Foreground="#FFE6D7D7" Text="Loading Media Browser Server..." TextWrapping="WrapWithOverflow"/>
+                <Rectangle Fill="#FF49494B" HorizontalAlignment="Left" Height="13" Stroke="Black" VerticalAlignment="Bottom" Width="662"/>
+                <Rectangle x:Name="rectProgress" Fill="#FF0A0ABF" HorizontalAlignment="Left" Height="13" Stroke="Black" VerticalAlignment="Bottom" Width="0"/>
+            </Grid>
+        </Grid>
+
+    </Border>
 </Window>

+ 2 - 1
MediaBrowser.ServerApplication/Splash/SplashWindow.xaml.cs

@@ -19,9 +19,10 @@ namespace MediaBrowser.ServerApplication.Splash
     /// </summary>
     public partial class SplashWindow : Window
     {
-        public SplashWindow()
+        public SplashWindow(Version version)
         {
             InitializeComponent();
+            lblStatus.Text = string.Format("Loading Media Browser Server\nVersion {0}...", version);
         }
     }
 }

+ 0 - 3
MediaBrowser.sln

@@ -173,7 +173,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 EndGlobal