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: [PATCH] Added new icons and fixed some splash screen issues

---
 MediaBrowser.Common/UI/Splash.xaml               |   2 +-
 MediaBrowser.Common/UI/Splash.xaml.cs            |  15 ++++-----------
 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
 7 files changed, 16 insertions(+), 17 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

diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
index 79085682ae..f52d9ddf1f 100644
--- a/MediaBrowser.Common/UI/Splash.xaml
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -27,6 +27,6 @@
     <Grid Name="splashGrid">
         <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"/>
+        <TextBlock Name="lblProgress" Margin="0,190,10,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2" FontSize="18" Foreground="Black" Text="Label"></TextBlock>
     </Grid>
 </Controls:MetroWindow>
diff --git a/MediaBrowser.Common/UI/Splash.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs
index 68926a0632..fdd36396fe 100644
--- a/MediaBrowser.Common/UI/Splash.xaml.cs
+++ b/MediaBrowser.Common/UI/Splash.xaml.cs
@@ -1,8 +1,7 @@
-using System;
-using System.Windows;
-using MahApps.Metro.Controls;
-using MediaBrowser.Common.Logging;
+using MahApps.Metro.Controls;
 using MediaBrowser.Model.Progress;
+using System;
+using System.Windows;
 
 namespace MediaBrowser.Common.UI
 {
@@ -21,13 +20,7 @@ namespace MediaBrowser.Common.UI
 
         void ProgressChanged(object sender, TaskProgress e)
         {
-            // If logging has loaded, put a message in the log.
-            if (Logger.LoggerInstance != null)
-            {
-                Logger.LogInfo(e.Description);
-            }
-
-            lblProgress.Content = e.Description;
+            lblProgress.Text = e.Description;
             pbProgress.Value = (double)e.PercentComplete;
         }
 
diff --git a/MediaBrowser.ServerApplication/App.xaml.cs b/MediaBrowser.ServerApplication/App.xaml.cs
index 8219fd078b..41fb8f24e7 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 00fdfbfefd..4843f024a5 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 0000000000000000000000000000000000000000..bd1b788d83614e035df227c7b6697b18f9ce0a25
GIT binary patch
literal 1150
zcma*mNlX)A7zW@mdhntlF$yYBHgRDIq9`D08bN`mNI|45Q30iZP$|^1HW(1u1gTo-
zLWiYN3e*Zzq}tI6HWUyWz)%xRG~vM2L@%CRe@eU%LYT?(|1)3S@0(0ALs47E>EuL_
z)q~<~qo_R;MI9nYiBwkWWZTr?yLZ<Oe|P8K0W6ol8}Vnk{2_AJ4h{C&XE<@d4V!Vy
zd;h1k{h<e0qY+0uQC5(Hhn1pri3RzH@bg00A(l1R!<l#7(`AWRUO{^Qo(npNZ(rvy
zW-_j8(Y}C{%-H}RYowp6Ejqvr|3w}3MRbTiG%7jS{nn*cNFABT;KNqVF}H=}FmG_f
ze83I&L0qUm;!Yh!U#Ak6!-LkPQOO*c*pq?Q^f31YeR~T`x=y_5k)b$~3qfWYK8zY5
z;@!l(?CU7J!Nu*wi%5<-g@iN5(bu6s!r73O8P*&&%g*%4(OQ_~Ak5-|Px1@1HjKR+
zg~iNZ+A<E?<OFO}6ZrUc1amXfNWE|xS0aL~!V4bu;kNrIjrDZMONs_BIUYq>>8RxM
zP**O*Yn>J&`hL*TR;cAt^mnPC?NCB|H+NDY<k+VS9q6h|L1%d~3Q{g1BR&SXDICXp
zC|e)lL5ToORb|ks+i|6qjfAEsJXbZ4IrOxu<f`5Ft{3`dJ`7JwP@0{F)EG80IkCt~
zOGMGFbW{{%qegVsG2>}{HH3|~;aly3Yt6A!GQlPLyjhR$GiEG)evk2?7f>`+gO)Vl
zg{&2Qv<!N+3WJ&sbU&$I>QT07m2^vgn&k42onmVF*`4$D?g}n?Ycip0%)^kR7;oAt
zVWMkc?rDZ)K#Hkh8efbW80lIa>DfwHh~^z)iY3j9oR#yVL5nz0i&LR}kcF2`1sHxJ
zf>BWgrmG%fS_vjzDPU}`>0SBWN$*WUMQnT7m><_$oiVCw$TbZ<7MNZ?D>WGv_Zg<M
zj`^r*VJtc+Gda}Gd>-jGs1*DY<e7nlD<LQDt^I#Cx+nSF#60npFcXQtr~&qW6uI7%
L?W;Nb9AN(gDsc#J

literal 0
HcmV?d00001

diff --git a/MediaBrowser.ServerApplication/Resources/Images/loadingIcon1-16.ico b/MediaBrowser.ServerApplication/Resources/Images/loadingIcon1-16.ico
new file mode 100644
index 0000000000000000000000000000000000000000..76588068ea56efee7e95759814c2953aed0458f2
GIT binary patch
literal 1150
zcmb7@YfRHu7{>qYzmzg{L0z^wS4#&L5PE@9Xva;;tpyo|av2Whg^pkcMLU6Aq|SgE
z6_Ke71O%-`s0@UKrWC5HXrZDTGA5NxqsdH+*@t~lmym2eJDb5|*|KEk<aeHvC-3vV
zIUf#1G067!r^p#Vm9Z%5Rf?iQ2*e`JbDzk6F7`eV9dvH%D-l}x_Q?3K#}TRG1yOdy
zf>28|c=dva&;1+WeC`v1ez7UXm7lA>+y49bFVpCJWJAUM6G*tV6RX@C5tSrF^jh9O
zkOi*3`Xc|Riov<@USs~vPf$2-LckB3;X9KF&Xp8Y@2|vx+L{;C8p{zE_9m1ed{1P+
zYh_Ua?oWh=p*ti$huJgX>xcq-A^|?`MEJQ>I6u;Zai;?=*C-r!FXQ%u+enrMBT*FO
zNeO#nS}o#1p%H*RAc2o{9Z@lS`oiI3lfid52C8H+;)|jYKU@T*T?@@fIn?rSq(p{#
za%8-@ca(wP9SH+#QUTT_IavK-D9&Vo>&V55!C0tMrO4iv4E?<Zyfsmb<=t|u&sQKL
zM(in8u9>rT9Kx~*6<Bi`(3ceuSv0sbYC~zQ4$1)?4DT00zcml(Kh|Ky4GkDQLddF>
z$c~NhY)|5Qt)s1=rxHNl$^bnYh1~iA%*{+=d~5`6*F{`+U%@w1li+_>Kx))rI;05S
z6NQa&k)Epb0Iy~EFjx)=nBy`qha|`|<>NzLF=`At?EiEZZ2eYPE_8u?Ee^Cd15B43
zo6hQB+M&PJUX|m$I%Xzs5`pdu0rT8CB-dp?zbOZrz7nXMyHK~=h{SF!Xip57-^Tql
z-+0D|K6BUg&X4lE(__6zvups}A^`JP0M>pUixO=nj^FG=nx_&1Gs$!ZfgY2B`E?{#
zTICSdtwKR##?(n;mUq^50rtrrEI%oMf2$PQzEX4?KZpbK?WmZkhtDYi7^nHqdkl)6
z6?Sd07ae>1-peNHVRLz!_w4RM^wyW4sbMpEn+&kG)}sIP9#q|LM%L_3(1W31oLU1$
z8xO3buXijnQ4=KFNR<D@2Prdcm1=a=<iKKj7uJ0`3^W+f)>45j4~`=CjsYxJG?<n^
zEa?@&@2d^gr6#(R<U0whfx{Kqy>;70`VZ-yLrq4ft@&f8qkZqiBW9yJ_0DIHh4W=k
zUvjISu!p2iS?0iBxr6H8{91xb$m}*k_2U2eH|4aYbN<Bd#CkTTF~)c4-X%PenI(Kr
Ua1nA{)R#$%P~`r9ct+~~0Ech_CIA2c

literal 0
HcmV?d00001

diff --git a/MediaBrowser.ServerApplication/Resources/Images/loadingIcon2-16.ico b/MediaBrowser.ServerApplication/Resources/Images/loadingIcon2-16.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4d986a85b5ee0085449e370fbc9e0fd0099722bb
GIT binary patch
literal 1150
zcmb8ueN59w7zglQf4>$cVS?M-nvA|dbwJxeDXgM(SX&*#@FJr)5GN&OQW)|!e2JwF
zC_xd?F<7wO+QwF1#@j#{h!84Wv+^R2iFA`WH8XSBe@2sqfA-y(g=H_vlHKKVcX@Kp
zJ-OtLqFAJdhEik{QiW`adXb{2NP>h&<c~O+{<F~^%GZQ8E7C%Wcy;_#!DC^DctxBo
zTajifRwUA}6`6qhH&Oxj2~o6qC}UMh*3Z22<e82rFn!So@Tw4f*MPTwX+?}K3a@S8
z{fi>v<u6zBpU%t~i7wC?1(r<!=1MG-x86nB&lVgyU5tk6BY!eglt3j3M`EPF7bkqF
zFkZy{Q6c6&3^t1%v1~%HKH-7x5@Xj~G0YF_=ooRr?H)ttcO$5tX~pejKQytgAW0_n
zX(eGdl4U$Z7KDQyjsZOo1==Y>K)V13=Zt8*a}hg|WZ;@(z%=o}oaN*AwI(DdNTH33
z@?|P`OW9i@5ag7A_9(ziDG=Bz#qJJ0L|#2kEn1MOibcFp1^Rph7`qsv&LpI5i$jX?
zRo}iu{?aM?QPAYR%z_%s+-4-V>o7Tb8F{sO>}bzLd43M|9M1yXEd_lk8l29JNZqeO
z`WCs*pceSeQzt=B#Dlr@CfL_sM@f|)OA9wJb#)Y8_XK9W9`sKSff*t-e4D{|H$h`a
zM20HPSM`R_Z*tdyH7Efyza9LgT$B{<Mdg8gI9z!UCyiAY?(4>h&l|vuC6F4sz<jNR
z*;NZuS<$q$D%0<nb%5>I0G>AmnfGh3zf=c9ZYKC+Sx6r@;zVsFBD%F;+)A*&(SW(8
z#94bidM?;!ZAW$fuO>Pn>{Mf`I}hc{XOL5$1ASHsf<BYug-aSd?}`VfM+VLpa<JX;
zi0s&gjdfh?X-=6rUy<s+=^j9n=Nyv8bCEw;1+&EnYfA%yN4A1<brS+E%MnQK&LMAe
zT~ETVM#r(<yq2`PYfaR{w)b}WoyHt=nG4X<Xuwd*`xt4j#-O7HYbUkfOluG@uf=no
z?a)l=5oSv;k~}Zb{H%!*d|a$uu#_glek2nv(_VDfA3%T8A-LMg5i+?G>lWUE@=h5l
z?tg?2e)tq&-<I7Aw(uKBzKvk_pDs!7sw)`nYb+WcJXbM3+;(jIinV6q;)QBY_@wT!
z>U!BD{bJ)!=4IDy%l8BGrJlM6Ar_f|)V2_Z|N4Laxn5(<2;x|Fb5`SI|9avku}HXy
TEH~Awe(D}U{ZGH;_o{yfE1Unu

literal 0
HcmV?d00001