From e4b0eb5779d56b3d494bf5792f0058853b3b1df3 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Sun, 2 Sep 2012 16:24:10 -0400
Subject: Added taskbar icon and standardized locations of images

---
 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
 4 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 MediaBrowser.ServerApplication/Icons/Icon.ico
 create mode 100644 MediaBrowser.ServerApplication/Resources/Images/Icon.ico

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/Icons/Icon.ico b/MediaBrowser.ServerApplication/Icons/Icon.ico
deleted file mode 100644
index fa612891b8..0000000000
Binary files a/MediaBrowser.ServerApplication/Icons/Icon.ico and /dev/null differ
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml b/MediaBrowser.ServerApplication/MainWindow.xaml
index f768e1b225..e5c8487520 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 fa54626af1..00fdfbfefd 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 0000000000..f8accfab24
Binary files /dev/null and b/MediaBrowser.ServerApplication/Resources/Images/Icon.ico differ
-- 
cgit v1.2.3