diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/NavigationView.xaml
index 9030f59b..cd511cde 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/NavigationView.xaml
@@ -1,7 +1,8 @@
+ Tag="{x:Type local:HomeView}">
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml
index 306f10c2..f1d277f3 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml
@@ -1,9 +1,10 @@
+ xmlns:views="clr-namespace:Samples.Modules.Button.Views"
+ Header="Button Controls" Tag="{x:Type views:HomeView}">
-
-
+
+
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml
index bb162dd6..5ba2d9ed 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml
@@ -1,9 +1,10 @@
+ xmlns:views="clr-namespace:Samples.Modules.Calculator.Views"
+ Header="Calculator Controls" Tag="{x:Type views:HomeView}">
-
-
+
+
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
index 497eb83c..d3faffd7 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
@@ -1,6 +1,7 @@
+ xmlns:views="clr-namespace:Samples.Modules.ChildWindow.Views"
+ Header="ChildWindow" Tag="{x:Type views:HomeView}">
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
index d54b09af..515bc609 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
@@ -1,6 +1,7 @@
+ xmlns:views="clr-namespace:Samples.Modules.Color.Views"
+ Header="Color" Tag="{x:Type views:HomeView}">
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
index 1309e19c..0eac14cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
@@ -1,6 +1,7 @@
+ xmlns:views="clr-namespace:Samples.Modules.DateTime.Views"
+ Header="DateTime" Tag="{x:Type views:HomeView}">
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
index d806c6a3..7a0d7c17 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
@@ -1,6 +1,7 @@
+ xmlns:views="clr-namespace:Samples.Modules.Numeric.Views"
+ Header="Numeric" Tag="{x:Type views:HomeView}">
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
index 1c59039f..236d1800 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
@@ -1,6 +1,7 @@
+ xmlns:views="clr-namespace:Samples.Modules.PropertyGrid.Views"
+ Header="ChildWindow" Tag="{x:Type views:HomeView}">
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
index 72a69ada..28347a0f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
@@ -1,6 +1,7 @@
+ xmlns:views="clr-namespace:Samples.Modules.Text.Views"
+ Header="Text" Tag="{x:Type views:HomeView}">
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
index bb7f9d84..782030c7 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
@@ -17,8 +17,8 @@ namespace Samples.Infrastructure.Commands
{
//This treeview command is specfic to the navigation region,
//so I always want to pass the tag of the selected treeviewitem
- //because it will conatin the fully qualified navigation path
- CommandParameter = (e.NewValue as FrameworkElement).Tag;
+ //because it will conatin the Type of view to navigate to.
+ CommandParameter = ((e.NewValue as FrameworkElement).Tag as Type).FullName;
ExecuteCommand();
}
}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
index 19e49e37..5e6f9b05 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
@@ -34,7 +34,14 @@
-
+
+
+
+
+
+
+
+
+