From e977548b06e7ce762473abbf15c63d740d057e99 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 23 Apr 2013 11:02:02 -0400
Subject: fixes #169 - Double click on taskbar icon

---
 MediaBrowser.ServerApplication/MainWindow.xaml     |  28 +--------------------
 .../MediaBrowser.ServerApplication.csproj          |   8 ------
 .../Resources/Images/Loading/1.ico                 | Bin 151319 -> 0 bytes
 .../Resources/Images/Loading/2.ico                 | Bin 151909 -> 0 bytes
 .../Resources/Images/Loading/3.ico                 | Bin 152352 -> 0 bytes
 .../Resources/Images/Loading/4.ico                 | Bin 153201 -> 0 bytes
 .../Resources/Images/Loading/5.ico                 | Bin 154508 -> 0 bytes
 .../Resources/Images/Loading/6.ico                 | Bin 153527 -> 0 bytes
 8 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 MediaBrowser.ServerApplication/Resources/Images/Loading/1.ico
 delete mode 100644 MediaBrowser.ServerApplication/Resources/Images/Loading/2.ico
 delete mode 100644 MediaBrowser.ServerApplication/Resources/Images/Loading/3.ico
 delete mode 100644 MediaBrowser.ServerApplication/Resources/Images/Loading/4.ico
 delete mode 100644 MediaBrowser.ServerApplication/Resources/Images/Loading/5.ico
 delete mode 100644 MediaBrowser.ServerApplication/Resources/Images/Loading/6.ico

diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml b/MediaBrowser.ServerApplication/MainWindow.xaml
index bbc7e64c8f..518c55a767 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml
@@ -10,7 +10,7 @@
         WindowStyle="None" 
         ShowInTaskbar="False">
     <Grid>
-        <tb:TaskbarIcon Name="MbTaskbarIcon" ToolTipText="Media Browser Server">
+        <tb:TaskbarIcon Name="MbTaskbarIcon" ToolTipText="Media Browser Server" IconSource="/Resources/Images/icon.ico">
 
             <tb:TaskbarIcon.ContextMenu>
                 <ContextMenu Background="White">
@@ -35,32 +35,6 @@
                 </ContextMenu>
             </tb:TaskbarIcon.ContextMenu>
 
-            <tb:TaskbarIcon.Style>
-                <Style TargetType="{x:Type tb:TaskbarIcon}">
-                    <Setter Property="IconSource" Value="/Resources/Images/icon.ico" />
-                    <Style.Triggers>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="1">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/1.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="2">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/2.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="3">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/3.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="4">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/4.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="5">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/5.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="6">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/6.ico" />
-                        </DataTrigger>
-                    </Style.Triggers>
-                </Style>
-            </tb:TaskbarIcon.Style>
-
         </tb:TaskbarIcon>
     </Grid>
 </Window>
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index b272dd4bf7..7fd8463a85 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -333,14 +333,6 @@
     <Resource Include="Resources\Images\mblogoblackfull.png" />
     <Resource Include="Resources\Images\mblogowhitefull.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Images\Loading\1.ico" />
-    <Resource Include="Resources\Images\Loading\2.ico" />
-    <Resource Include="Resources\Images\Loading\3.ico" />
-    <Resource Include="Resources\Images\Loading\4.ico" />
-    <Resource Include="Resources\Images\Loading\5.ico" />
-    <Resource Include="Resources\Images\Loading\6.ico" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
       <Visible>False</Visible>
diff --git a/MediaBrowser.ServerApplication/Resources/Images/Loading/1.ico b/MediaBrowser.ServerApplication/Resources/Images/Loading/1.ico
deleted file mode 100644
index 63acf6d33c..0000000000
Binary files a/MediaBrowser.ServerApplication/Resources/Images/Loading/1.ico and /dev/null differ
diff --git a/MediaBrowser.ServerApplication/Resources/Images/Loading/2.ico b/MediaBrowser.ServerApplication/Resources/Images/Loading/2.ico
deleted file mode 100644
index 6eb60cbe08..0000000000
Binary files a/MediaBrowser.ServerApplication/Resources/Images/Loading/2.ico and /dev/null differ
diff --git a/MediaBrowser.ServerApplication/Resources/Images/Loading/3.ico b/MediaBrowser.ServerApplication/Resources/Images/Loading/3.ico
deleted file mode 100644
index 7cde0746f3..0000000000
Binary files a/MediaBrowser.ServerApplication/Resources/Images/Loading/3.ico and /dev/null differ
diff --git a/MediaBrowser.ServerApplication/Resources/Images/Loading/4.ico b/MediaBrowser.ServerApplication/Resources/Images/Loading/4.ico
deleted file mode 100644
index db2a895a5f..0000000000
Binary files a/MediaBrowser.ServerApplication/Resources/Images/Loading/4.ico and /dev/null differ
diff --git a/MediaBrowser.ServerApplication/Resources/Images/Loading/5.ico b/MediaBrowser.ServerApplication/Resources/Images/Loading/5.ico
deleted file mode 100644
index 4c9c4fd0df..0000000000
Binary files a/MediaBrowser.ServerApplication/Resources/Images/Loading/5.ico and /dev/null differ
diff --git a/MediaBrowser.ServerApplication/Resources/Images/Loading/6.ico b/MediaBrowser.ServerApplication/Resources/Images/Loading/6.ico
deleted file mode 100644
index 6d2eba5488..0000000000
Binary files a/MediaBrowser.ServerApplication/Resources/Images/Loading/6.ico and /dev/null differ
-- 
cgit v1.2.3