From f1770605eab46608fcee1abec04eb5ead2b27ab6 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Sun, 16 Sep 2012 20:09:12 -0400
Subject: Added new icons and fixed some splash screen issues

---
 MediaBrowser.ServerApplication/App.xaml.cs               |   3 +--
 .../MediaBrowser.ServerApplication.csproj                |  13 ++++++++++---
 .../Resources/Images/icon16.ico                          | Bin 0 -> 1150 bytes
 .../Resources/Images/loadingIcon1-16.ico                 | Bin 0 -> 1150 bytes
 .../Resources/Images/loadingIcon2-16.ico                 | Bin 0 -> 1150 bytes
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 MediaBrowser.ServerApplication/Resources/Images/icon16.ico
 create mode 100644 MediaBrowser.ServerApplication/Resources/Images/loadingIcon1-16.ico
 create mode 100644 MediaBrowser.ServerApplication/Resources/Images/loadingIcon2-16.ico

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/App.xaml.cs b/MediaBrowser.ServerApplication/App.xaml.cs
index 8219fd078..41fb8f24e 100644
--- a/MediaBrowser.ServerApplication/App.xaml.cs
+++ b/MediaBrowser.ServerApplication/App.xaml.cs
@@ -29,8 +29,7 @@ namespace MediaBrowser.ServerApplication
 
         public static void OpenDashboard()
         {
-            OpenUrl("http://localhost:" + Kernel.Instance.Configuration.HttpServerPortNumber +
-                        "/mediabrowser/dashboard/index.html");
+            OpenUrl("http://localhost:" + Kernel.Instance.Configuration.HttpServerPortNumber + "/mediabrowser/dashboard/index.html");
         }
         
         public static void OpenUrl(string url)
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 00fdfbfef..4843f024a 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -37,7 +37,7 @@
     <StartupObject>MediaBrowser.ServerApplication.App</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Resources\Images\Icon.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\Images\icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Hardcodet.Wpf.TaskbarNotification">
@@ -45,6 +45,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -120,9 +121,15 @@
       <Name>MediaBrowser.Model</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <Resource Include="Resources\Images\Icon.ico" />
+    <Resource Include="Resources\Images\icon16.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\loadingIcon1-16.ico" />
+    <Resource Include="Resources\Images\loadingIcon2-16.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/icon16.ico b/MediaBrowser.ServerApplication/Resources/Images/icon16.ico
new file mode 100644
index 000000000..bd1b788d8
Binary files /dev/null and b/MediaBrowser.ServerApplication/Resources/Images/icon16.ico differ
diff --git a/MediaBrowser.ServerApplication/Resources/Images/loadingIcon1-16.ico b/MediaBrowser.ServerApplication/Resources/Images/loadingIcon1-16.ico
new file mode 100644
index 000000000..76588068e
Binary files /dev/null and b/MediaBrowser.ServerApplication/Resources/Images/loadingIcon1-16.ico differ
diff --git a/MediaBrowser.ServerApplication/Resources/Images/loadingIcon2-16.ico b/MediaBrowser.ServerApplication/Resources/Images/loadingIcon2-16.ico
new file mode 100644
index 000000000..4d986a85b
Binary files /dev/null and b/MediaBrowser.ServerApplication/Resources/Images/loadingIcon2-16.ico differ
-- 
cgit v1.2.3