diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-16 20:09:12 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-16 20:09:12 -0400 |
| commit | f1770605eab46608fcee1abec04eb5ead2b27ab6 (patch) | |
| tree | d7b3f224e6e8ee906cf9281996ae5545ed29f312 /MediaBrowser.Common/UI | |
| parent | 373ee6f7ecc339b1f8a4199a9bd970a0b093f327 (diff) | |
Added new icons and fixed some splash screen issues
Diffstat (limited to 'MediaBrowser.Common/UI')
| -rw-r--r-- | MediaBrowser.Common/UI/Splash.xaml | 2 | ||||
| -rw-r--r-- | MediaBrowser.Common/UI/Splash.xaml.cs | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml index 79085682ae..f52d9ddf1f 100644 --- a/MediaBrowser.Common/UI/Splash.xaml +++ b/MediaBrowser.Common/UI/Splash.xaml @@ -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>
diff --git a/MediaBrowser.Common/UI/Splash.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs index 68926a0632..fdd36396fe 100644 --- a/MediaBrowser.Common/UI/Splash.xaml.cs +++ b/MediaBrowser.Common/UI/Splash.xaml.cs @@ -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;
}
|