From e4b0eb5779d56b3d494bf5792f0058853b3b1df3 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Sun, 2 Sep 2012 16:24:10 -0400 Subject: [PATCH] Added taskbar icon and standardized locations of images --- MediaBrowser.Common/MediaBrowser.Common.csproj | 11 ++++++++++- MediaBrowser.Common/Resources/Images/Icon.ico | Bin 0 -> 32038 bytes .../{mblogo.png => Images/mblogoblack.png} | Bin .../Resources/Images/mblogowhite.png | Bin 0 -> 27029 bytes MediaBrowser.Common/UI/BaseApplication.cs | 13 ------------- MediaBrowser.Common/UI/Splash.xaml | 9 +++++---- MediaBrowser.Common/UI/Splash.xaml.cs | 2 -- MediaBrowser.Controller/Kernel.cs | 4 ++-- MediaBrowser.ServerApplication/Icons/Icon.ico | Bin 10806 -> 0 bytes MediaBrowser.ServerApplication/MainWindow.xaml | 2 +- .../MediaBrowser.ServerApplication.csproj | 5 ++++- .../Resources/Images/Icon.ico | Bin 0 -> 32038 bytes 12 files changed, 22 insertions(+), 24 deletions(-) create mode 100644 MediaBrowser.Common/Resources/Images/Icon.ico rename MediaBrowser.Common/Resources/{mblogo.png => Images/mblogoblack.png} (100%) create mode 100644 MediaBrowser.Common/Resources/Images/mblogowhite.png delete mode 100644 MediaBrowser.ServerApplication/Icons/Icon.ico create mode 100644 MediaBrowser.ServerApplication/Resources/Images/Icon.ico diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 841eccf736..90ee7d1ee7 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -30,6 +30,9 @@ prompt 4 + + Resources\Images\Icon.ico + ..\packages\MahApps.Metro.0.9.0.0\lib\net40\MahApps.Metro.dll @@ -132,7 +135,13 @@ - + + + + + + +