From 4eb48c8bd7050aef96f5870b1f23104f5a90d8c0 Mon Sep 17 00:00:00 2001
From: Philipp Sumi <philipp@hardcodet.net>
Date: Fri, 22 Nov 2013 19:10:11 +0000
Subject: [PATCH] CHG   Minor sample improvements.

git-svn-id: https://svn.evolvesoftware.ch/repos/evolve.net/WPF/NotifyIcon@193 9f600761-6f11-4665-b6dc-0185e9171623
---
 Source/Sample Project/App.xaml                | 22 +++++++++----------
 Source/Sample Project/Sample Project.csproj   |  1 +
 .../SimpleWindowWithNotifyIcon.xaml           | 17 +++++++-------
 .../03 - Popups/InlinePopupWindow.xaml        |  3 +++
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Source/Sample Project/App.xaml b/Source/Sample Project/App.xaml
index e4e63cf..11ae36c 100644
--- a/Source/Sample Project/App.xaml	
+++ b/Source/Sample Project/App.xaml	
@@ -1,14 +1,14 @@
 <Application x:Class="Samples.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    StartupUri="Main.xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="Main.xaml">
     <Application.Resources>
-         
-    	<ResourceDictionary>
-    		<ResourceDictionary.MergedDictionaries>
-    			<ResourceDictionary Source="Showcase/NotifyIconResources.xaml"/>
-    		</ResourceDictionary.MergedDictionaries>
-    	</ResourceDictionary>
-         
+
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Showcase/NotifyIconResources.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+
     </Application.Resources>
-</Application>
+</Application>
\ No newline at end of file
diff --git a/Source/Sample Project/Sample Project.csproj b/Source/Sample Project/Sample Project.csproj
index 491f845..d268001 100644
--- a/Source/Sample Project/Sample Project.csproj	
+++ b/Source/Sample Project/Sample Project.csproj	
@@ -99,6 +99,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Compile Include="Commands\CloseWindowCommand.cs" />
     <Compile Include="Showcase\FancyToolTip.xaml.cs">
       <DependentUpon>FancyToolTip.xaml</DependentUpon>
     </Compile>
diff --git a/Source/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml b/Source/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml
index 146c78d..acc53fe 100644
--- a/Source/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml	
+++ b/Source/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml	
@@ -7,15 +7,14 @@
     Width="300">
     <Grid>
 
-        <!-- in order to declare a NotifyIcon, all you need is the
-      namespace declaration (see above on line 5) and a single line -->
-        <tb:TaskbarIcon
-            x:Name="MyNotifyIcon"
-            IconSource="/Icons/Error.ico"
-            ToolTipText="hello world" />
-        <TextBlock Margin="26,26,24,0" VerticalAlignment="Top" FontWeight="Bold" TextWrapping="Wrap">
-            <Run Text="You should see an icon in the tray." Language="de-ch" />
-        </TextBlock>
+        <!-- in order to declare a NotifyIcon, all you need is the namespace declaration (see above on line 5) and a single line -->
+        <tb:TaskbarIcon x:Name="MyNotifyIcon" IconSource="/Icons/Error.ico" ToolTipText="hello world" />
+
+        <TextBlock Margin="26,26,24,0"
+                   VerticalAlignment="Top"
+                   FontWeight="Bold"
+                   TextWrapping="Wrap"
+                   Text="You should see an icon in the tray." />
 
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/Source/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml b/Source/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml
index 1b18323..9645b30 100644
--- a/Source/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml	
+++ b/Source/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml	
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
+    xmlns:commands="clr-namespace:Samples.Commands"
     Height="300"
     Width="300">
     <Grid>
@@ -32,6 +33,8 @@
                             Text="Enter Text..." />
                         <Button
                             Content="Click Me!"
+                            Command="{commands:CloseWindowCommand}"
+                            CommandParameter="{Binding}"
                             Margin="5,0,5,10"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center" />