Added taskbar icon and standardized locations of images

12 files changed, 22 insertions, 24 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
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
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
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();

         }

     }

 }

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 32f4a5828..91e2524a8 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -249,7 +249,7 @@ namespace MediaBrowser.Controller
             user.Id = Guid.NewGuid();

             list.Add(user);

 

-            user = new User();

+            /*user = new User();

             user.Name = "Test User 4";

             user.Id = Guid.NewGuid();

             list.Add(user);

@@ -262,7 +262,7 @@ namespace MediaBrowser.Controller
             user = new User();

             user.Name = "Test User 6";

             user.Id = Guid.NewGuid();

-            list.Add(user);

+            list.Add(user);*/

             

             return list;

         }

diff --git a/MediaBrowser.ServerApplication/Icons/Icon.ico b/MediaBrowser.ServerApplication/Icons/Icon.ico
deleted file mode 100644
index fa612891b..000000000
--- a/MediaBrowser.ServerApplication/Icons/Icon.ico
+++ /dev/null
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml b/MediaBrowser.ServerApplication/MainWindow.xaml
index f768e1b22..e5c848752 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:tb="http://www.hardcodet.net/taskbar"

         Title="MainWindow" Height="350" Width="525" AllowsTransparency="True" Background="Transparent" WindowStyle="None" ShowInTaskbar="False">

     <Grid>

-        <tb:TaskbarIcon Name="MbTaskbarIcon" IconSource="/Icons/Icon.ico" ToolTipText="MediaBrowser Server">

+        <tb:TaskbarIcon Name="MbTaskbarIcon" IconSource="/Resources/Images/Icon.ico" ToolTipText="MediaBrowser Server">

 

             <tb:TaskbarIcon.ContextMenu>

                 <ContextMenu Background="White">

diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index fa54626af..00fdfbfef 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -36,6 +36,9 @@
   <PropertyGroup>

     <StartupObject>MediaBrowser.ServerApplication.App</StartupObject>

   </PropertyGroup>

+  <PropertyGroup>

+    <ApplicationIcon>Resources\Images\Icon.ico</ApplicationIcon>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="Hardcodet.Wpf.TaskbarNotification">

       <HintPath>..\packages\Hardcodet.Wpf.TaskbarNotification.1.0.4.0\lib\net40\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>

@@ -119,7 +122,7 @@
   </ItemGroup>

   <ItemGroup />

   <ItemGroup>

-    <Resource Include="Icons\Icon.ico" />

+    <Resource Include="Resources\Images\Icon.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. 

diff --git a/MediaBrowser.ServerApplication/Resources/Images/Icon.ico b/MediaBrowser.ServerApplication/Resources/Images/Icon.ico
new file mode 100644
index 000000000..f8accfab2
--- /dev/null
+++ b/MediaBrowser.ServerApplication/Resources/Images/Icon.ico