aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Common')
-rw-r--r--MediaBrowser.Common/MediaBrowser.Common.csproj11
-rw-r--r--MediaBrowser.Common/Resources/Images/Icon.icobin0 -> 32038 bytes
-rw-r--r--MediaBrowser.Common/Resources/Images/mblogoblack.png (renamed from MediaBrowser.Common/Resources/mblogo.png)bin32983 -> 32983 bytes
-rw-r--r--MediaBrowser.Common/Resources/Images/mblogowhite.pngbin0 -> 27029 bytes
-rw-r--r--MediaBrowser.Common/UI/BaseApplication.cs13
-rw-r--r--MediaBrowser.Common/UI/Splash.xaml9
-rw-r--r--MediaBrowser.Common/UI/Splash.xaml.cs2
7 files changed, 15 insertions, 20 deletions
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 841eccf73..90ee7d1ee 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -30,6 +30,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup>
+ <ApplicationIcon>Resources\Images\Icon.ico</ApplicationIcon>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="MahApps.Metro">
<HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\MahApps.Metro.dll</HintPath>
@@ -132,7 +135,13 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Resources\mblogo.png" />
+ <Resource Include="Resources\Images\mblogoblack.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\Images\Icon.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\Images\mblogowhite.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/MediaBrowser.Common/Resources/Images/Icon.ico b/MediaBrowser.Common/Resources/Images/Icon.ico
new file mode 100644
index 000000000..f8accfab2
--- /dev/null
+++ b/MediaBrowser.Common/Resources/Images/Icon.ico
Binary files differ
diff --git a/MediaBrowser.Common/Resources/mblogo.png b/MediaBrowser.Common/Resources/Images/mblogoblack.png
index 84323fe52..84323fe52 100644
--- a/MediaBrowser.Common/Resources/mblogo.png
+++ b/MediaBrowser.Common/Resources/Images/mblogoblack.png
Binary files differ
diff --git a/MediaBrowser.Common/Resources/Images/mblogowhite.png b/MediaBrowser.Common/Resources/Images/mblogowhite.png
new file mode 100644
index 000000000..a39812e35
--- /dev/null
+++ b/MediaBrowser.Common/Resources/Images/mblogowhite.png
Binary files differ
diff --git a/MediaBrowser.Common/UI/BaseApplication.cs b/MediaBrowser.Common/UI/BaseApplication.cs
index 2112be679..a45faca50 100644
--- a/MediaBrowser.Common/UI/BaseApplication.cs
+++ b/MediaBrowser.Common/UI/BaseApplication.cs
@@ -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;
- }
}
}
diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
index 56c295731..4d5c2717c 100644
--- a/MediaBrowser.Common/UI/Splash.xaml
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -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>
diff --git a/MediaBrowser.Common/UI/Splash.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs
index edfacf016..f66f9ec8f 100644
--- a/MediaBrowser.Common/UI/Splash.xaml.cs
+++ b/MediaBrowser.Common/UI/Splash.xaml.cs
@@ -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();
}
}
}