Added new icons and fixed some splash screen issues

This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti 2012-09-16 20:09:12 -04:00
parent 373ee6f7ec
commit f1770605ea
7 changed files with 16 additions and 17 deletions

View File

@ -27,6 +27,6 @@
<Grid Name="splashGrid">
<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"/>
<TextBlock Name="lblProgress" Margin="0,190,10,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2" FontSize="18" Foreground="Black" Text="Label"></TextBlock>
</Grid>
</Controls:MetroWindow>

View File

@ -1,8 +1,7 @@
using System;
using System.Windows;
using MahApps.Metro.Controls;
using MediaBrowser.Common.Logging;
using MahApps.Metro.Controls;
using MediaBrowser.Model.Progress;
using System;
using System.Windows;
namespace MediaBrowser.Common.UI
{
@ -21,13 +20,7 @@ namespace MediaBrowser.Common.UI
void ProgressChanged(object sender, TaskProgress e)
{
// If logging has loaded, put a message in the log.
if (Logger.LoggerInstance != null)
{
Logger.LogInfo(e.Description);
}
lblProgress.Content = e.Description;
lblProgress.Text = e.Description;
pbProgress.Value = (double)e.PercentComplete;
}

View File

@ -29,8 +29,7 @@ namespace MediaBrowser.ServerApplication
public static void OpenDashboard()
{
OpenUrl("http://localhost:" + Kernel.Instance.Configuration.HttpServerPortNumber +
"/mediabrowser/dashboard/index.html");
OpenUrl("http://localhost:" + Kernel.Instance.Configuration.HttpServerPortNumber + "/mediabrowser/dashboard/index.html");
}
public static void OpenUrl(string url)

View File

@ -37,7 +37,7 @@
<StartupObject>MediaBrowser.ServerApplication.App</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Images\Icon.ico</ApplicationIcon>
<ApplicationIcon>Resources\Images\icon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Hardcodet.Wpf.TaskbarNotification">
@ -45,6 +45,7 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
@ -120,9 +121,15 @@
<Name>MediaBrowser.Model</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Resource Include="Resources\Images\Icon.ico" />
<Resource Include="Resources\Images\icon16.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Images\icon.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Images\loadingIcon1-16.ico" />
<Resource Include="Resources\Images\loadingIcon2-16.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB