Added taskbar icon and standardized locations of images

This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti
2012-09-02 16:24:10 -04:00
parent 3c47375229
commit e4b0eb5779
12 changed files with 22 additions and 24 deletions

View File

@@ -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;
}
}
}

View File

@@ -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>

View File

@@ -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();
}
}
}