Mercurial > silverbladetech

changeset 39:4b8b38d17d24 MetroWPF CTP v0.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Quick tidy up for ctp 0.1 release
author adminsh@apollo
date Tue, 03 Apr 2012 15:33:18 +0100
parents b008faa1baa7
children 64c89891d7b6
files MetroWpf/MetroWpf/MetroWpf.csproj MetroWpf/Stocks.UI/ViewModels/StocksViewModel.cs MetroWpf/Stocks.UI/Views/StocksView.xaml MetroWpf/Stocks.UI/Views/StocksView.xaml.cs
diffstat 4 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/MetroWpf/MetroWpf/MetroWpf.csproj	Mon Apr 02 14:05:18 2012 +0100
+++ b/MetroWpf/MetroWpf/MetroWpf.csproj	Tue Apr 03 15:33:18 2012 +0100
@@ -47,8 +47,8 @@
     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
-    <Reference Include="Ninject, Version=2.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ninject.2.2.1.4\lib\net40-Client\Ninject.dll</HintPath>
+    <Reference Include="Ninject">
+      <HintPath>..\Libs\Ninject.2.2.1.4\lib\net40-Client\Ninject.dll</HintPath>
     </Reference>
     <Reference Include="NinjectAdapter">
       <HintPath>..\Libs\CommonServiceLocator.NinjectAdapter.1.0.0.0\lib\NinjectAdapter.dll</HintPath>
--- a/MetroWpf/Stocks.UI/ViewModels/StocksViewModel.cs	Mon Apr 02 14:05:18 2012 +0100
+++ b/MetroWpf/Stocks.UI/ViewModels/StocksViewModel.cs	Tue Apr 03 15:33:18 2012 +0100
@@ -59,7 +59,7 @@
         }
 
         private const string SubscribedPropertyName = "Subscribed";
-        private bool _subscribed = false;
+        private bool _subscribed;
 
         public bool Subscribed
         {
--- a/MetroWpf/Stocks.UI/Views/StocksView.xaml	Mon Apr 02 14:05:18 2012 +0100
+++ b/MetroWpf/Stocks.UI/Views/StocksView.xaml	Tue Apr 03 15:33:18 2012 +0100
@@ -4,9 +4,10 @@
              xmlns:Converters="clr-namespace:Stocks.UI.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:ViewModels="clr-namespace:Stocks.UI.ViewModels" 
              d:DesignHeight="100"
              d:DesignWidth="600"
-             DataContext="d:DesignInstance vm:StocksViewModel"
+             d:DataContext="{d:DesignInstance ViewModels:StocksViewModel}"
              mc:Ignorable="d">
 
     <Grid x:Name="LayoutRoot">
@@ -30,7 +31,7 @@
                     Height="30"
                     Margin="5,0,0,0"
                     HorizontalAlignment="Left"
-                    Command="{Binding ServiceCommand,
+                    Command="{Binding Path=ServiceCommand,
                                       Mode=TwoWay}"
                     Content="{Binding ServiceRunning,
                                       Converter={StaticResource BoolToServiceRunningTextConverter}}" />
@@ -39,7 +40,7 @@
                     Height="30"
                     Margin="10,0,0,0"
                     HorizontalAlignment="Left"
-                    Command="{Binding SubscriptionCommand,
+                    Command="{Binding Path=SubscriptionCommand,
                                       Mode=TwoWay}"
                     Content="{Binding Subscribed,
                                       Converter={StaticResource BoolToSubscribedTextConverter}}" />
--- a/MetroWpf/Stocks.UI/Views/StocksView.xaml.cs	Mon Apr 02 14:05:18 2012 +0100
+++ b/MetroWpf/Stocks.UI/Views/StocksView.xaml.cs	Tue Apr 03 15:33:18 2012 +0100
@@ -1,11 +1,6 @@
-using System.Windows.Controls;
-
-namespace Stocks.UI.Views
+namespace Stocks.UI.Views
 {
-    /// <summary>
-    /// Interaction logic for StocksView.xaml
-    /// </summary>
-    public partial class StocksView : UserControl
+    public partial class StocksView
     {
         public StocksView()
         {