Tweaks and minor changes

slodge · Jan 22, 2012 · 6b6e529 · 6b6e529
1 parent 9520610
commit 6b6e529
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 5 deletions.
diff --git a/SmilieHappy/AboutPage.xaml b/SmilieHappy/AboutPage.xaml
@@ -32,11 +32,11 @@
 
         <!--ContentPanel - place additional content here-->
         <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
-            <Image x:Name="SelectedImage"  Height="400" Width="400" Opacity="0.33"></Image>
+            <Image x:Name="SelectedImage"  Height="456" Width="456" Source="Images/Smilie1.png" Opacity="0.33"></Image>
             <ScrollViewer>
                 <StackPanel>
                     <TextBlock TextWrapping="Wrap" Margin="12" Style="{StaticResource PhoneTextTitle2Style}">About</TextBlock>
-                    <TextBlock TextWrapping="Wrap" Margin="12">:) or :( is brought to you by</TextBlock>
+                    <TextBlock TextWrapping="Wrap" Margin="12">;) or ;( is brought to you by</TextBlock>
                     <HyperlinkButton Margin="12" NavigateUri="/ext.xaml?http://www.cirrious.com" Content="cirrious.com" />
                     <TextBlock TextWrapping="Wrap" Margin="12">The face detection algorithm is provided by the excellent web service:</TextBlock>
                     <HyperlinkButton Margin="12" NavigateUri="/ext.xaml?http://www.face.com" Content="face.com" />

diff --git a/SmilieHappy/Images/ReadMe.txt b/SmilieHappy/Images/ReadMe.txt
@@ -1 +1,4 @@
-Smilie from http://commons.wikimedia.org/wiki/User:Kotakkasut
+Smilie's from clker.com - public domain
+Sample.jpg from my own collection
+ShezammSample.jpg from http://www.flickr.com/photos/shezamm/5774414680/ (Creative Commons with Attribution)
+AppBar icons from Microsoft (SDK) and from Templarian.com - Creative Commons (no attribution but mentioned here anyway)
diff --git a/SmilieHappy/Images/shezammsample.jpg b/SmilieHappy/Images/shezammsample.jpg
diff --git a/SmilieHappy/MainPage.xaml b/SmilieHappy/MainPage.xaml
@@ -33,7 +33,7 @@
 
         <!--ContentPanel - place additional content here-->
         <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
-            <Image x:Name="SelectedImage" Height="400" Width="400" Opacity="0.33"></Image>
+            <Image x:Name="SelectedImage" Height="456" Width="456" Opacity="0.33"></Image>
             <StackPanel Margin="12,36,12,12" x:Name="IntroPanel" VerticalAlignment="Top">
                 <TextBlock TextWrapping="Wrap" Margin="12">
                     You txt, therefore you are?

diff --git a/SmilieHappy/MainPage.xaml.cs b/SmilieHappy/MainPage.xaml.cs
@@ -35,7 +35,7 @@ private void LoadSmilies()
         {
             _smilieWriteableBitmap = LoadWriteable("Images/Smilie1.png");
             _unsmilieWriteableBitmap = LoadWriteable("Images/UnSmilie1.png");
-            _sampleBitmap = LoadWriteable("Images/sample.jpg");
+            _sampleBitmap = LoadWriteable("Images/shezammsample.jpg");
             SelectedImage.Source = _smilieWriteableBitmap;
         }
 

diff --git a/SmilieHappy/SmilieHappy.csproj b/SmilieHappy/SmilieHappy.csproj
@@ -139,6 +139,7 @@
     <Resource Include="Toolkit.Content\ApplicationBar.Select.png" />
     <Resource Include="Images\poweredByFace.png" />
     <Content Include="Images\ReadMe.txt" />
+    <Content Include="Images\shezammsample.jpg" />
     <Content Include="Images\Smilie1.png" />
     <Content Include="Images\UnSmilie1.png" />
     <Content Include="Images\sample.jpg" />

diff --git a/SmilieHappy/screenshots/screenshot2.png b/SmilieHappy/screenshots/screenshot2.png
diff --git a/SmilieHappy/screenshots/screenshot3.png b/SmilieHappy/screenshots/screenshot3.png
diff --git a/SmilieHappy/screenshots/screenshot4.png b/SmilieHappy/screenshots/screenshot4.png