Merge pull request #1 from MyToolkit/master

Update from base repo

README.md

@@ -1,7 +1,7 @@
 # MyToolkit for .NET
 
 [![Build status](https://ci.appveyor.com/api/projects/status/4oox3d156y9n6efp?svg=true)](https://ci.appveyor.com/project/rsuter/mytoolkit)
-[![NuGet Version](http://img.shields.io/nuget/v/MyToolkit.svg?style=flat)](https://www.nuget.org/packages?q=MyToolkit) 
+[![NuGet Version](https://badge.fury.io/nu/mytoolkit.svg)](https://www.nuget.org/packages?q=MyToolkit) 
 
 MyToolkit is a set of .NET libraries containing lots of useful classes for various .NET platforms like UWP/WinRT (Universal Windows Apps), Windows Phone and WPF. The goal is to provide missing or replace existing classes to support the development of high-quality Windows and Windows Phone applications. For example, the library provides often used MVVM infrastructure classes, missing UI controls, IoC classes, additional LINQ extension methods and much more. The project is developed and maintained by [Rico Suter](http://rsuter.com).
 

build/MyToolkit.AspNet.Mvc.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MyToolkit.AspNet.Mvc</id>
-    <version>2.5.8.0</version>
+    <version>2.5.11.0</version>
     <title>MyToolkit.AspNet.Mvc</title>
     <authors>Rico Suter</authors>
     <owners>Rico Suter</owners>
@@ -13,7 +13,7 @@
     <iconUrl>http://rsuter.com/Projects/MyToolkit/IconNuGet.png</iconUrl>
     <dependencies>
       <group>
-        <dependency id="MyToolkit" version="2.5.8.0" />
+        <dependency id="MyToolkit" version="2.5.11.0" />
       </group>
     </dependencies>
   </metadata>

build/MyToolkit.Build.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MyToolkit.Build</id>
-    <version>2.5.8.0</version>
+    <version>2.5.11.0</version>
     <title>MyToolkit.Build</title>
     <authors>Rico Suter</authors>
     <owners>Rico Suter</owners>

build/MyToolkit.Extended.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MyToolkit.Extended</id>
-    <version>2.5.8.0</version>
+    <version>2.5.11.0</version>
     <title>MyToolkit.Extended</title>
     <authors>Rico Suter</authors>
     <owners>Rico Suter</owners>
@@ -13,27 +13,27 @@
     <iconUrl>http://rsuter.com/Projects/MyToolkit/IconNuGet.png</iconUrl>
     <dependencies>
       <group>
-        <dependency id="MyToolkit" version="2.5.8.0" />
+        <dependency id="MyToolkit" version="2.5.11.0" />
       </group>
 	  <group targetFramework="win50">
-        <dependency id="MyToolkit" version="2.5.8.0" />
+        <dependency id="MyToolkit" version="2.5.11.0" />
       </group>
       <group targetFramework="sl50">
-        <dependency id="MyToolkit" version="2.5.8.0" />
+        <dependency id="MyToolkit" version="2.5.11.0" />
       </group>
       <group targetFramework="sl4-wp71">
-        <dependency id="MyToolkit" version="2.5.8.0" />
+        <dependency id="MyToolkit" version="2.5.11.0" />
         <dependency id="WPtoolkit" version="4.2013.08.16" />
       </group>
       <group targetFramework="wp80">
-        <dependency id="MyToolkit" version="2.5.8.0" />
+        <dependency id="MyToolkit" version="2.5.11.0" />
         <dependency id="WPtoolkit" version="4.2013.08.16" />
       </group>
       <group targetFramework="net40">
         <dependency id="AsyncBridge" version="0.1.1" />
       </group>
       <group targetFramework="net45">
-        <dependency id="MyToolkit" version="2.5.8.0" />
+        <dependency id="MyToolkit" version="2.5.11.0" />
       </group>
     </dependencies>
   </metadata>

build/MyToolkit.Http.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MyToolkit.Http</id>
-    <version>2.5.8.0</version>
+    <version>2.5.11.0</version>
     <title>MyToolkit.Http</title>
     <authors>Rico Suter</authors>
     <owners>Rico Suter</owners>

build/MyToolkit.Web.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MyToolkit.Web</id>
-    <version>2.5.8.0</version>
+    <version>2.5.11.0</version>
     <title>MyToolkit.Web</title>
     <authors>Rico Suter</authors>
     <owners>Rico Suter</owners>
@@ -13,7 +13,7 @@
     <iconUrl>http://rsuter.com/Projects/MyToolkit/IconNuGet.png</iconUrl>
     <dependencies>
       <group>
-        <dependency id="MyToolkit" version="2.5.8.0" />
+        <dependency id="MyToolkit" version="2.5.11.0" />
       </group>
     </dependencies>
   </metadata>

build/MyToolkit.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MyToolkit</id>
-    <version>2.5.8.0</version>
+    <version>2.5.11.0</version>
     <title>MyToolkit</title>
     <authors>Rico Suter</authors>
     <owners>Rico Suter</owners>

src/MyToolkit.AspNet.Mvc/Properties/AssemblyInfo.cs

@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("64e396b3-5cf6-4dc0-b6da-eca0d9a6a820")]
 
-[assembly: AssemblyVersion("2.5.8.0")]
-[assembly: AssemblyFileVersion("2.5.8.0")]
+[assembly: AssemblyVersion("2.5.11.0")]
+[assembly: AssemblyFileVersion("2.5.11.0")]

src/MyToolkit.Extended.Sl5/Properties/AssemblyInfo.cs

@@ -14,5 +14,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("08517582-2ece-440a-a5e3-196040cb1d3a")]
 
-[assembly: AssemblyVersion("2.5.8.0")]
-[assembly: AssemblyFileVersion("2.5.8.0")]
+[assembly: AssemblyVersion("2.5.11.0")]
+[assembly: AssemblyFileVersion("2.5.11.0")]

src/MyToolkit.Extended.Uwp/Properties/AssemblyInfo.cs

@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("08517582-2ece-440a-a5e3-196040cb1d3a")]
 
-[assembly: AssemblyVersion("2.5.8.0")]
-[assembly: AssemblyFileVersion("2.5.8.0")]
+[assembly: AssemblyVersion("2.5.11.0")]
+[assembly: AssemblyFileVersion("2.5.11.0")]

src/MyToolkit.Extended.Uwp/Themes/Generic.xaml

@@ -109,6 +109,7 @@
 
     <!-- DataGrid -->
     <Style TargetType="controls:DataGrid">
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
         <Setter Property="HeaderBackground" Value="{ThemeResource SystemControlHighlightChromeHighBrush}" />
         <Setter Property="RowBackgroundOddBrush" Value="{ThemeResource SystemControlPageBackgroundChromeLowBrush}" />
         <Setter Property="CellTemplate">

src/MyToolkit.Extended.WinRT/MyToolkit.Extended.WinRT.csproj

@@ -89,13 +89,7 @@
   </ItemGroup>
   <Import Project="..\MyToolkit.Extended\MyToolkit.Extended.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
+
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/MyToolkit.Extended.WinRT/Properties/AssemblyInfo.cs

@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("08517582-2ece-440a-a5e3-196040cb1d3a")]
 
-[assembly: AssemblyVersion("2.5.8.0")]
-[assembly: AssemblyFileVersion("2.5.8.0")]
+[assembly: AssemblyVersion("2.5.11.0")]
+[assembly: AssemblyFileVersion("2.5.11.0")]

src/MyToolkit.Extended.WinRT/Themes/Generic.xaml

@@ -109,6 +109,7 @@
 
     <!-- DataGrid -->
     <Style TargetType="controls:DataGrid">
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}" />
         <Setter Property="HeaderBackground" Value="{StaticResource ListBoxItemDisabledForegroundThemeBrush}" />
         <Setter Property="CellTemplate">
             <Setter.Value>

src/MyToolkit.Extended.Wp7/Properties/AssemblyInfo.cs

@@ -14,5 +14,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("08517582-2ece-440a-a5e3-196040cb1d3a")]
 
-[assembly: AssemblyVersion("2.5.8.0")]
-[assembly: AssemblyFileVersion("2.5.8.0")]
+[assembly: AssemblyVersion("2.5.11.0")]
+[assembly: AssemblyFileVersion("2.5.11.0")]

src/MyToolkit.Extended.Wp8/Properties/AssemblyInfo.cs

@@ -14,5 +14,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("08517582-2ece-440a-a5e3-196040cb1d3a")]
 
-[assembly: AssemblyVersion("2.5.8.0")]
-[assembly: AssemblyFileVersion("2.5.8.0")]
+[assembly: AssemblyVersion("2.5.11.0")]
+[assembly: AssemblyFileVersion("2.5.11.0")]

src/MyToolkit.Extended.Wpf/Properties/AssemblyInfo.cs

@@ -14,8 +14,8 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("08517582-2ece-440a-a5e3-196040cb1d3a")]
 
-[assembly: AssemblyVersion("2.5.8.0")]
-[assembly: AssemblyFileVersion("2.5.8.0")]
+[assembly: AssemblyVersion("2.5.11.0")]
+[assembly: AssemblyFileVersion("2.5.11.0")]
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, 

src/MyToolkit.Extended.Wpf/Utilities/FileOpenHandler.cs

@@ -50,8 +50,10 @@ public void Initialize(Window window)
                 catch { }
             });
             thread.Start();
-
-            window.Closed += (sender, eventArgs) => cancelEvent.Set();
+            window.Dispatcher.ShutdownStarted += (sender, eventArgs) =>
+            {
+                cancelEvent.Set();
+            };
         }
 
         private string GetHash(string text)
@@ -154,4 +156,4 @@ private void OnFileOpened(string fileName)
             });
         }
     }
-}
+}

src/MyToolkit.Extended/Controls/DataGrid/DataGrid.cs

@@ -47,7 +47,7 @@ public DataGrid()
         }
 
         /// <summary>Occurs when the selected item (row) has changed. </summary>
-        public event SelectionChangedEventHandler SelectionChanged;
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged;
 
         /// <summary>Occurs when the user clicked on an item and wants to navigate to its detail page. </summary>
         public event EventHandler<NavigationListEventArgs> Navigate;

src/MyToolkit.Extended/Controls/DataGrid/DataGridColumnBase.cs

@@ -10,6 +10,7 @@
 
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Data;
 
 namespace MyToolkit.Controls
 {
@@ -79,9 +80,10 @@ public GridLength Width
         }
 
         /// <summary>Generates the cell for the given item. </summary>
+        /// <param name="dataGrid">The data grid.</param>
         /// <param name="dataItem">The item to generate the cell for. </param>
         /// <returns>The <see cref="DataGridCellBase"/>. </returns>
-        public abstract DataGridCellBase CreateCell(object dataItem);
+        public abstract DataGridCellBase CreateCell(DataGrid dataGrid, object dataItem);
 
         /// <summary>Gets the property path which is used for sorting. </summary>
         public abstract PropertyPath OrderPropertyPath { get; }
@@ -92,6 +94,25 @@ internal ColumnDefinition CreateGridColumnDefinition()
         {
             return new ColumnDefinition { Width = Width };
         }
+
+        protected void CreateBinding(
+            DependencyProperty sourceDependencyProperty,
+            string sourceDependencyPropertyName,
+            FrameworkElement targetElement,
+            DependencyProperty targetElementDependencyProperty)
+        {
+            var binding = ReadLocalValue(sourceDependencyProperty) as BindingExpression;
+            if (binding != null)
+                targetElement.SetBinding(targetElementDependencyProperty, binding.ParentBinding);
+            else
+            {
+                targetElement.SetBinding(targetElementDependencyProperty, new Binding
+                {
+                    Path = new PropertyPath(sourceDependencyPropertyName),
+                    Source = this
+                });
+            }
+        }
     }
 }
 

src/MyToolkit.Extended/Controls/DataGrid/DataGridRow.cs

@@ -77,7 +77,7 @@ private bool CreateCells(object item)
             var hasStar = false;
             foreach (var column in DataGrid.Columns)
             {
-                var cell = column.CreateCell(item);
+                var cell = column.CreateCell(DataGrid, item);
                 cell.Control.Tag = cell;
                 cell.Control.DataContext = item; 
 
@@ -155,6 +155,7 @@ private void UpdateItemDetails()
                     if (_detailsControl == null)
                     {
                         _detailsControl = new ContentControl();
+                        _detailsControl.FontSize = DataGrid.FontSize; 
                         _detailsControl.Content = Item;
                         _detailsControl.ContentTemplate = DataGrid.ItemDetailsTemplate;
                         _detailsControl.VerticalContentAlignment = VerticalAlignment.Stretch;

src/MyToolkit.Extended/Controls/DataGrid/DataGridTemplatedColumn.cs

@@ -31,10 +31,11 @@ public override PropertyPath OrderPropertyPath
         /// <summary>Gets or sets a value indicating whether the column is only visible when the column is selected.  </summary>
         public bool OnlyVisibleOnSelection { get; set; }
 
-        /// <summary>Generates the cell for the given item. </summary>
-        /// <param name="dataItem">The item to generate the cell for. </param>
-        /// <returns>The <see cref="DataGridCellBase"/>. </returns>
-        public override DataGridCellBase CreateCell(object dataItem)
+        /// <summary>Generates the cell for the given item.</summary>
+        /// <param name="dataGrid">The data grid.</param>
+        /// <param name="dataItem">The item to generate the cell for.</param>
+        /// <returns>The <see cref="DataGridCellBase" />.</returns>
+        public override DataGridCellBase CreateCell(DataGrid dataGrid, object dataItem)
         {
             var control = new ContentControl();
             control.HorizontalContentAlignment = HorizontalAlignment.Stretch;