diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs index 193a4edb..f3277f08 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs index 3ada70e4..1ff53e6e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -21,13 +22,16 @@ using System.Text; namespace Xceed.Wpf.AvalonDock.Themes { - public class AeroTheme : Theme + public class AeroTheme : Theme + { + public override Uri GetResourceUri() { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.Aero;component/Theme.xaml", - UriKind.Relative); - } + string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Aero"; + + + return new Uri( + "/" + assemblyName + ";component/Theme.xaml", + UriKind.Relative ); } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml index 6bbd6968..f6924f56 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs index 4d803c94..164d8a35 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs index c4e43d71..fe54a3f7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -30,7 +31,7 @@ using System; [assembly: AssemblyCompany( "Xceed Software Inc." )] [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2019" )] +[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2020" )] diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml index b2eeee91..4553b657 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -16,15 +17,13 @@ + xmlns:avalonDockConverters="http://schemas.xceed.com/wpf/xaml/avalondock" + xmlns:avalonDockProperties="http://schemas.xceed.com/wpf/xaml/avalondock"> @@ -43,6 +42,10 @@ + + + + - + + @@ -403,9 +408,9 @@ - + /// + /// + /// Generate an absolute uri by default + public ImageUriExtension() + :base( UriKind.Absolute ) + { + + } + + public override object ProvideValue( IServiceProvider serviceProvider ) + { + // Call base class + Uri uri = ( Uri ) base.ProvideValue( serviceProvider ); + + // Create a bitmap image object using the generated uri as the source + BitmapImage image = new BitmapImage( uri ); + + // Provide the image + return image; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs index 582cccc6..208d59b9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs index c8388ecb..885be561 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs index ab598c53..694f8ca2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs index 30508b64..731b1fbd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs index a2ec6d7b..866dca0d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs index e43a9b4e..a7116603 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs index c6dcb0ae..daf05fbf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs index d4ba10d5..532cc239 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs index da34cce8..92c492da 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs index defef0ab..9b5b7fbd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs index 06bafef8..426ebe3d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs index cfaf41ea..1428e4bf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs index f73dbd95..8a6cbab0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs index 730249c8..1fd9a29e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs index 3fca370c..cb5a51bc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs index 18cf3a70..70157700 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs index 982407f4..5550ea58 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs index b5b68d04..40f18a79 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs new file mode 100644 index 00000000..c408b756 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs @@ -0,0 +1,163 @@ +/************************************************************************************* + + Toolkit for WPF + + Copyright (C) 2007-2020 Xceed Software Inc. + + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + + For more features, controls, and fast professional support, + pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + + ***********************************************************************************/ + +using System; +using System.Windows.Markup; + +namespace Xceed.Wpf.Toolkit.Core +{ + [MarkupExtensionReturnType( typeof( Uri ) )] + public class PackUriExtension : MarkupExtension + { + #region Constructors + public PackUriExtension() + :this( UriKind.Relative ) + { + + } + + public PackUriExtension( UriKind uriKind ) + { + this.m_uriKind = uriKind; + } + + #endregion // Constructors + + #region AssemblyName Property + + public string AssemblyName + { + get { return this.m_assemblyName; } + set { this.m_assemblyName = value; } + } + + #endregion // AssemblyName Property + + #region Path Property + + public string Path + { + get { return this.m_path; } + set { this.m_path = value; } + } + + #endregion // Path Property + + #region Kind Property + + public UriKind Kind + { + get { return this.m_uriKind; } + set { this.m_uriKind = value; } + } + + #endregion // Kind Property + + #region PUBLIC METHODS + + public override object ProvideValue( IServiceProvider serviceProvider ) + { + if( string.IsNullOrEmpty( this.m_path ) ) + throw new InvalidOperationException( "Path must be set during initialization" ); + + string uriString; + + switch( this.m_uriKind ) + { + case UriKind.RelativeOrAbsolute: + case UriKind.Relative: + uriString = BuildRelativePackUriString( this.m_assemblyName, this.m_path ); + break; + + case UriKind.Absolute: + uriString = BuildAbsolutePackUriString( this.m_assemblyName, this.m_path ); + break; + + default: + throw new NotSupportedException(); + } + + return new Uri( uriString, this.m_uriKind ); + } + + #endregion PUBLIC METHODS + + #region INTERNAL METHODS + + internal static string BuildRelativePackUriString( string assemblyName, string path ) + { + return BuildRelativePackUriString( assemblyName, String.Empty, path ); + } + + internal static string BuildRelativePackUriString( string assemblyName, string version, string path ) + { + if( string.IsNullOrEmpty( assemblyName ) ) + throw new ArgumentException( "assemblyName cannot be null or empty", assemblyName ); + + string platformSuffix = String.Empty; + + + + // If we have version information + if( !String.IsNullOrEmpty( version ) ) + { + // Format it for the pack uri + version = ";v" + version; + } + + // Format a relative pack uri string + string uriString = string.Format( "/{0}{1}{2};component/{3}", assemblyName, platformSuffix, version, path ); + + return uriString; + } + + internal static string BuildAbsolutePackUriString( string assemblyName, string path ) + { + return BuildAbsolutePackUriString( assemblyName, String.Empty, path ); + } + + internal static string BuildAbsolutePackUriString( string assemblyName, string version, string path ) + { + string platformSuffix = String.Empty; + bool hasAssemblyName = !String.IsNullOrEmpty( assemblyName ); + + + + // If we have an assembly name and version information + if( hasAssemblyName && !String.IsNullOrEmpty( version ) ) + { + // Format it for the pack uri + version = ";v" + version; + } + + // Format an absolute pack uri string + string uriString = string.Format( "pack://application:,,,/{0}{1}{2};component/{3}", assemblyName, platformSuffix, version, path ); + + return uriString; + } + + #endregion INTERNAL METHODS + + #region PRIVATE FIELDS + + private string m_assemblyName; + private string m_path; + private UriKind m_uriKind; + + #endregion PRIVATE FIELDS + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs index 53ee619b..464351f1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs index 4cf7a415..b700fec5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs index 7c97ba88..d5f1637c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs index 1cc849cf..e11fbc5b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs new file mode 100644 index 00000000..5b781d56 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs @@ -0,0 +1,111 @@ +/************************************************************************************* + + Toolkit for WPF + + Copyright (C) 2007-2020 Xceed Software Inc. + + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + + For more features, controls, and fast professional support, + pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + + ***********************************************************************************/ + +using System; +using System.ComponentModel; +using System.Diagnostics; + +namespace Xceed.Wpf.Toolkit.Core +{ + public class ResourceDictionary : System.Windows.ResourceDictionary, ISupportInitialize + { + private int _initializingCount; + private string _assemblyName; + private string _sourcePath; + + + public ResourceDictionary() { } + + public ResourceDictionary( string assemblyName, string sourcePath ) + { + ( ( ISupportInitialize )this ).BeginInit(); + this.AssemblyName = assemblyName; + this.SourcePath = sourcePath; + ( ( ISupportInitialize )this ).EndInit(); + } + + public string AssemblyName + { + get { return _assemblyName; } + set + { + this.EnsureInitialization(); + _assemblyName = value; + } + } + + public string SourcePath + { + get { return _sourcePath; } + set + { + this.EnsureInitialization(); + _sourcePath = value; + } + } + + protected virtual Uri BuildUri() + { + // Build a pack uri relative to the root of the supplied assembly name + string uriStr = PackUriExtension.BuildRelativePackUriString( this.AssemblyName, this.SourcePath ); + return new Uri( uriStr, UriKind.Relative ); + } + + private void EnsureInitialization() + { + if( _initializingCount <= 0 ) + throw new InvalidOperationException( this.GetType().Name + " properties can only be set while initializing." ); + } + + void ISupportInitialize.BeginInit() + { + base.BeginInit(); + _initializingCount++; + } + + void ISupportInitialize.EndInit() + { + _initializingCount--; + Debug.Assert( _initializingCount >= 0 ); + + if( _initializingCount <= 0 ) + { + if( this.Source != null ) + throw new InvalidOperationException( "Source property cannot be initialized on the " + this.GetType().Name ); + + if( string.IsNullOrEmpty( this.AssemblyName ) || string.IsNullOrEmpty( this.SourcePath ) ) + throw new InvalidOperationException( "AssemblyName and SourcePath must be set during initialization" ); + + // Build the pack uri based on the value of our properties + Uri uri = this.BuildUri(); + + // Load the resources + this.Source = uri; + } + + base.EndInit(); + } + + + private enum InitState + { + NotInitialized, + Initializing, + Initialized + }; + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs index fcc9ff16..af8ece1c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs index c38d48eb..d6d11323 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs index 81542fc1..ed9f8bbd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs index d9fd7a9d..3a5274e9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs index 7e1335f0..60d1befb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs index 3f0c79ef..5c25aeff 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs index 030a3b2a..025bc9f2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs index 47cc397e..1794ad33 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs index be1540a9..cbd7a3a5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs index b71821d8..a43d2a3f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs index d96c6240..b02e3a7a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs index 18cabe79..506bc2cb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs index d227e78c..e169d338 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs index f1a53632..12c277c9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs index 62d9d29b..3018acfe 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs index 1aa6d6a6..faa6bd37 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs index 5f46e4bf..9b860a78 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs index 715615aa..d6045245 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs index 0fc28ef4..fd6f6638 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs index 40912021..8327d10e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs index 9a06859b..7cd38750 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs index 63d0c96a..6d089dce 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs index 72a32e2a..82f18a43 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs index 266dc96b..58fd54f5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs index 3b9ad7b4..bff7a715 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -15,91 +16,23 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; -using System.ComponentModel; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.Core { - public class VersionResourceDictionary : ResourceDictionary, ISupportInitialize + public class VersionResourceDictionary : ResourceDictionary { - private int _initializingCount; - private string _assemblyName; - private string _sourcePath; - - public VersionResourceDictionary() { } - public VersionResourceDictionary(string assemblyName, string sourcePath) - { - ( ( ISupportInitialize )this ).BeginInit(); - this.AssemblyName = assemblyName; - this.SourcePath = sourcePath; - ( ( ISupportInitialize )this ).EndInit(); - } - - public string AssemblyName - { - get { return _assemblyName; } - set - { - this.EnsureInitialization(); - _assemblyName = value; - } - } - - public string SourcePath - { - get { return _sourcePath; } - set - { - this.EnsureInitialization(); - _sourcePath = value; - } - } - - private void EnsureInitialization() + public VersionResourceDictionary( string assemblyName, string sourcePath ) + :base( assemblyName, sourcePath ) { - if( _initializingCount <= 0 ) - throw new InvalidOperationException( "VersionResourceDictionary properties can only be set while initializing." ); - } - void ISupportInitialize.BeginInit() - { - base.BeginInit(); - _initializingCount++; } - void ISupportInitialize.EndInit() + protected override Uri BuildUri() { - _initializingCount--; - Debug.Assert( _initializingCount >= 0 ); - - if( _initializingCount <= 0 ) - { - if( this.Source != null ) - throw new InvalidOperationException( "Source property cannot be initialized on the VersionResourceDictionary" ); - - if( string.IsNullOrEmpty( this.AssemblyName ) || string.IsNullOrEmpty( this.SourcePath ) ) - throw new InvalidOperationException( "AssemblyName and SourcePath must be set during initialization" ); - - //Using an absolute path is necessary in VS2015 for themes different than Windows 8. - string uriStr = string.Format( @"pack://application:,,,/{0};v{1};component/{2}", this.AssemblyName, _XceedVersionInfo.Version, this.SourcePath ); - this.Source = new Uri( uriStr, UriKind.Absolute ); - } - - base.EndInit(); + string uriStr = PackUriExtension.BuildAbsolutePackUriString( this.AssemblyName, _XceedVersionInfo.Version, this.SourcePath ); + return new Uri( uriStr, UriKind.Absolute ); } - - - private enum InitState - { - NotInitialized, - Initializing, - Initialized - }; } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs index 2a399350..011a6d2b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs index 9dd41367..8c95d95e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs index 63bba7fd..5ef5b433 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -21,6 +22,7 @@ using System.Windows.Input; using System.Windows.Controls.Primitives; using Xceed.Wpf.Toolkit.Core.Utilities; using Xceed.Wpf.Toolkit.Primitives; +using System.Windows.Shapes; #if VS2008 using Microsoft.Windows.Controls; using Microsoft.Windows.Controls.Primitives; @@ -246,13 +248,17 @@ namespace Xceed.Wpf.Toolkit base.OnApplyTemplate(); if( _calendar != null ) - _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged; + { + _calendar.SelectedDatesChanged -= this.Calendar_SelectedDatesChanged; + _calendar.MouseDoubleClick -= this.Calendar_MouseDoubleClick; + } _calendar = GetTemplateChild( PART_Calendar ) as Calendar; if( _calendar != null ) { - _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged; + _calendar.SelectedDatesChanged += this.Calendar_SelectedDatesChanged; + _calendar.MouseDoubleClick += this.Calendar_MouseDoubleClick; _calendar.SelectedDate = Value ?? null; _calendar.DisplayDate = Value ?? this.ContextNow; this.SetBlackOutDates(); @@ -452,6 +458,15 @@ namespace Xceed.Wpf.Toolkit } } + private void Calendar_MouseDoubleClick( object sender, MouseButtonEventArgs e ) + { + var source = e.OriginalSource as Shape; + if( ( source != null ) && ( source.TemplatedParent is CalendarDayButton ) ) + { + this.ClosePopup( true ); + } + } + protected override void Popup_Opened( object sender, EventArgs e ) { base.Popup_Opened( sender, e ); @@ -480,12 +495,12 @@ namespace Xceed.Wpf.Toolkit { _calendar.BlackoutDates.Clear(); - if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value != System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime ) ) + if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value >= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.AddDays(1) ) ) { DateTime minDate = this.Minimum.Value; _calendar.BlackoutDates.Add( new CalendarDateRange( System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime, minDate.AddDays( -1 ) ) ); } - if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value != System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime ) ) + if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value <= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime.AddDays(-1)) ) { DateTime maxDate = this.Maximum.Value; _calendar.BlackoutDates.Add( new CalendarDateRange( maxDate.AddDays( 1 ), System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime ) ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml index fe76d044..01a523ed 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml index ede63736..deaec813 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs index 932a1646..563722b2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs index 35ba9e96..42a244ce 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs index 72abedf6..069cc814 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs index 7b326c7e..0f305b15 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs index 7c5dea26..212214e6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml index 0725e32f..42ce984d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml index c896174d..e6fc57d0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs index b3f468c0..3ea9df90 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml index a4a6e9da..18cd102c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml index aca9bcab..4ef9c4dd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs index 044efff1..3da94952 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml index f5ec452e..380be473 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml index f5ec452e..380be473 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs index 65571708..5f14984d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs index 88381005..1d6f430b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs index 3ff5f5df..df3ede90 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs index b436d4af..7579deb1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs index b1a8f9c7..b034f68a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml index aecadd02..8115b39d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs index f71e9ca2..9a20d1c8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs index 205e70ea..74c92f7c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs index d3cf5286..265cdac8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs index 9fd0c9a7..6d9af2f6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs index 19aa5d77..85e128b1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs index 6ad75ec0..c8ad5a19 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml index 1f6bf19a..d62d936f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml index a8d2e712..03644080 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs index 71457650..2da81257 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml index 01c96c6b..1fc7c6a6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml index f8d5af8d..7d87c194 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs index 1af3f92c..a68bf856 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs index 6ff6574b..7ca7cfd0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs index 8fb54e58..bac6a64c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -152,17 +153,27 @@ namespace Xceed.Wpf.Toolkit private bool HandleNullSpin() { - if( !Value.HasValue ) + var hasValue = this.UpdateValueOnEnterKey + ? (this.ConvertTextToValue( this.TextBox.Text ) != null) + : this.Value.HasValue; + + if( !hasValue ) { - T forcedValue = ( DefaultValue.HasValue ) - ? DefaultValue.Value - : default( T ); + var forcedValue = this.DefaultValue.HasValue ? this.DefaultValue.Value : default( T ); + var newValue = CoerceValueMinMax( forcedValue ); - Value = CoerceValueMinMax( forcedValue ); + if( this.UpdateValueOnEnterKey ) + { + this.TextBox.Text = newValue.Value.ToString( this.FormatString, this.CultureInfo ); + } + else + { + this.Value = newValue; + } return true; } - else if( !Increment.HasValue ) + else if( !this.Increment.HasValue ) { return true; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs index 26918a87..df09bb58 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs index 8e77a3e8..be2479dc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs index 8ef94366..e24c9b76 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs index 1a01c817..df661686 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs index 45b787cc..3a5444bd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs index f74b5ba8..31465386 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs index a7c3ea49..c4236e41 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs index d5814be0..08c2ccf2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs index b814437d..557baa2e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs index db6d16de..96565a1f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs index fe2c03c1..ecbcc3d3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml index d7f5a6d2..f26eae83 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml index 8e888527..7869f470 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs index aed41241..d249b110 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs index 3c248dd3..ac1603da 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs index ba22d71a..fcf2798a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs index 3e93b670..810ea3ef 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs index b9a3148c..3a499488 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs index 2c48e49b..9adade6b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs index 776196fe..68ee8665 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs index 257b6eeb..e3586e20 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs index 47882792..15aa6c88 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs index 3af9931b..ebabe6b4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs index c57bf891..2e69d20c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs index 177087fd..de58791f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs index dd014e61..a8cf8649 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs index 715c81a6..c84bf9e9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs index e660d4c6..496db17b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs index a8d8ff4e..6967aeb9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs index eb8d10d6..836d2db9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs index 6975cbeb..55eb4309 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs index a2ceca2d..f898c181 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs index faaae2b1..bccb1f70 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs index 328c74a1..53729968 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs index b1d037c5..eac124bd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs index cd022028..44fd138d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml index e7c234ab..15497801 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml index 5235268f..4f92e434 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs index 48c3a7ef..9d9ccf37 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs index 7c6a0688..ea0e7cf2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs index bf4bd904..862844a0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs index 5a63802b..3951f47b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs index c5c9b2ef..8c56d84c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs index a02c136a..1ba5aa4b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs index 060976ad..951f7e73 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -16,6 +17,7 @@ using System.Collections.Specialized; using System.Windows; +using System.Linq; namespace Xceed.Wpf.Toolkit.Primitives { @@ -112,12 +114,12 @@ namespace Xceed.Wpf.Toolkit.Primitives public void SelectAll() { + // Have a faster selection when there are more than 200 items. + this.UpdateSelectedItemsWithoutNotifications( this.ItemsCollection.Cast().ToList() ); + // Raise SelectionChanged for every items. foreach( var item in this.ItemsCollection ) { - if( !this.SelectedItems.Contains( item ) ) - { - this.SelectedItems.Add( item ); - } + this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, true ) ); } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs index 09b5e047..4e1e5b5f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs index 900d44df..8f39bc8f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -27,6 +28,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Reflection; using Xceed.Wpf.Toolkit.Core.Utilities; +using System.Windows.Threading; namespace Xceed.Wpf.Toolkit.Primitives { @@ -96,7 +98,7 @@ namespace Xceed.Wpf.Toolkit.Primitives private static void OnDelimiterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e ) { - ( (Selector)o ).OnSelectedItemChanged( (string)e.OldValue, (string)e.NewValue ); + ( ( Selector )o ).OnSelectedItemChanged( ( string )e.OldValue, ( string )e.NewValue ); } protected virtual void OnSelectedItemChanged( string oldValue, string newValue ) @@ -263,7 +265,7 @@ namespace Xceed.Wpf.Toolkit.Primitives private static void OnSelectedMemberPathChanged( DependencyObject o, DependencyPropertyChangedEventArgs e ) { Selector sel = ( ( Selector )o ); - sel.OnSelectedMemberPathChanged( (string)e.OldValue, (string)e.NewValue ); + sel.OnSelectedMemberPathChanged( ( string )e.OldValue, ( string )e.NewValue ); } protected virtual void OnSelectedMemberPathChanged( string oldValue, string newValue ) @@ -372,7 +374,7 @@ namespace Xceed.Wpf.Toolkit.Primitives _surpressItemSelectionChanged = true; var selectorItem = element as FrameworkElement; - selectorItem.SetValue( SelectorItem.IsSelectedProperty, SelectedItems.Contains(item) ); + selectorItem.SetValue( SelectorItem.IsSelectedProperty, SelectedItems.Contains( item ) ); _surpressItemSelectionChanged = false; } @@ -398,7 +400,7 @@ namespace Xceed.Wpf.Toolkit.Primitives return; if( !VirtualizingStackPanel.GetIsVirtualizing( this ) - || (VirtualizingStackPanel.GetIsVirtualizing( this ) && (newValue != null)) ) + || ( VirtualizingStackPanel.GetIsVirtualizing( this ) && ( newValue != null ) ) ) { this.RemoveUnavailableSelectedItems(); } @@ -517,7 +519,7 @@ namespace Xceed.Wpf.Toolkit.Primitives // and let the synchronization be made from UpdateFromSelectedItems(); SelectedItems.Clear(); - if( (selectedValues != null) && (selectedValues.Count > 0) ) + if( ( selectedValues != null ) && ( selectedValues.Count > 0 ) ) { ValueEqualityComparer comparer = new ValueEqualityComparer(); @@ -525,7 +527,7 @@ namespace Xceed.Wpf.Toolkit.Primitives { object itemValue = GetItemfunction( item ); - bool isSelected = (itemValue != null) + bool isSelected = ( itemValue != null ) && selectedValues.Contains( itemValue.ToString(), comparer ); if( isSelected ) @@ -539,6 +541,25 @@ namespace Xceed.Wpf.Toolkit.Primitives this.UpdateFromSelectedItems(); } + internal void UpdateSelectedItemsWithoutNotifications( List selectedValues ) + { + _ignoreSelectedItemsCollectionChanged++; + // Just update the SelectedItems collection content + // and let the synchronization be made from UpdateFromSelectedItems(); + this.SelectedItems.Clear(); + + if( ( selectedValues != null ) && ( selectedValues.Count > 0 ) ) + { + foreach( object item in this.ItemsCollection ) + { + this.SelectedItems.Add( item ); + } + } + _ignoreSelectedItemsCollectionChanged--; + + this.UpdateFromSelectedItems(); + } + private bool? GetSelectedMemberPathValue( object item ) { if( String.IsNullOrEmpty( this.SelectedMemberPath ) ) @@ -550,7 +571,7 @@ namespace Xceed.Wpf.Toolkit.Primitives if( nameParts.Length == 1 ) { var property = item.GetType().GetProperty( this.SelectedMemberPath ); - if( (property != null) && (property.PropertyType == typeof( bool )) ) + if( ( property != null ) && ( property.PropertyType == typeof( bool ) ) ) return property.GetValue( item, null ) as bool?; return null; } @@ -588,7 +609,7 @@ namespace Xceed.Wpf.Toolkit.Primitives if( nameParts.Length == 1 ) { var property = item.GetType().GetProperty( this.SelectedMemberPath ); - if( (property != null) && (property.PropertyType == typeof( bool )) ) + if( ( property != null ) && ( property.PropertyType == typeof( bool ) ) && ( ( bool )property.GetValue( item, null ) != value ) ) { property.SetValue( item, value, null ); } @@ -626,6 +647,9 @@ namespace Xceed.Wpf.Toolkit.Primitives if( _ignoreSelectedItemsCollectionChanged > 0 ) return; + // Keep it simple for now. Just update all + this.UpdateFromSelectedItems(); + if( e.Action == NotifyCollectionChangedAction.Reset ) { if( _internalSelectedItems != null ) @@ -665,9 +689,6 @@ namespace Xceed.Wpf.Toolkit.Primitives } } } - - // Keep it simple for now. Just update all - this.UpdateFromSelectedItems(); } private void OnItemSelectionChangedCore( RoutedEventArgs args, bool unselected ) @@ -788,29 +809,35 @@ namespace Xceed.Wpf.Toolkit.Primitives private void UpdateFromSelectedMemberPathValues() { _ignoreSelectedItemsCollectionChanged++; - foreach( var item in ItemsCollection ) + foreach( var item in this.ItemsCollection ) { - bool? isSelected = this.GetSelectedMemberPathValue( item ); + var isSelected = this.GetSelectedMemberPathValue( item ); if( isSelected != null ) { if( isSelected.Value ) { - if( !SelectedItems.Contains( item ) ) + if( !this.SelectedItems.Contains( item ) ) { - SelectedItems.Add( item ); + this.SelectedItems.Add( item ); } } else { - if( SelectedItems.Contains( item ) ) + if( this.SelectedItems.Contains( item ) ) { - SelectedItems.Remove( item ); + this.SelectedItems.Remove( item ); } } + + this.UpdateSelectorItem( item, isSelected.Value ); } } _ignoreSelectedItemsCollectionChanged--; - this.UpdateFromSelectedItems(); + + this.UpdateSelectedItem(); + this.UpdateSelectedValue(); + + this.UpdateInternalSelectedItems(); } internal void UpdateSelectedItems( IList selectedItems ) @@ -843,28 +870,38 @@ namespace Xceed.Wpf.Toolkit.Primitives /// private void UpdateFromSelectedItems() { - foreach( object o in ItemsCollection ) + foreach( var o in this.ItemsCollection ) { - bool isSelected = SelectedItems.Contains( o ); + bool isSelected = this.SelectedItems.Contains( o ); _ignoreSelectedMemberPathValuesChanged++; - this.SetSelectedMemberPathValue(o, isSelected); + this.SetSelectedMemberPathValue( o, isSelected ); _ignoreSelectedMemberPathValuesChanged--; - var selectorItem = ItemContainerGenerator.ContainerFromItem( o ) as SelectorItem; - if( selectorItem != null ) - { - selectorItem.IsSelected = isSelected; - } + this.UpdateSelectorItem( o, isSelected ); } - UpdateSelectedItem(); - UpdateSelectedValue(); + this.UpdateSelectedItem(); + this.UpdateSelectedValue(); + + this.UpdateInternalSelectedItems(); + } + private void UpdateInternalSelectedItems() + { _internalSelectedItems = new object[ this.SelectedItems.Count ]; this.SelectedItems.CopyTo( _internalSelectedItems, 0 ); } + private void UpdateSelectorItem( object item, bool isSelected ) + { + var selectorItem = ItemContainerGenerator.ContainerFromItem( item ) as SelectorItem; + if( selectorItem != null ) + { + selectorItem.IsSelected = isSelected; + } + } + /// /// Removes all items from SelectedItems that are no longer in ItemsSource. /// @@ -897,7 +934,7 @@ namespace Xceed.Wpf.Toolkit.Primitives if( hash.Contains( _removedItems[ i ] ) ) { SelectedItems.Add( _removedItems[ i ] ); - _removedItems.RemoveAt( i ); + _removedItems.RemoveAt( i ); i--; } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs index e4e65117..88fc0d1d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs index 3fc13083..5826fae4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml index ac818d74..b652a2dd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml index 1ea70d3a..6b007006 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml index 27ee7097..7c821c54 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml index 08fb2d03..14292df8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs index d9bce8cd..e2a75cf7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs index b1ab9784..fe0fe5bb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs index 6b4d032a..3544bcb9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs index 5646214a..6b03ed5c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs index a1d4ef01..24b3d508 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs index e7f87319..650ef702 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -36,7 +37,7 @@ using System.Windows.Markup; [assembly: AssemblyCompany("Xceed Software Inc.")] [assembly: AssemblyProduct( "Xceed Toolkit for WPF" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2019" )] +[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2020" )] [assembly: AssemblyCulture( "" )] @@ -50,26 +51,6 @@ using System.Windows.Markup; [assembly: CLSCompliant(true)] -[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Office2007" + ",PublicKey=" + - "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" + - "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" + - "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" + - "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" + - "f92cbfb5")] - -[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Metro" + ",PublicKey=" + - "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" + - "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" + - "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" + - "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" + - "f92cbfb5")] - -[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Windows10" + ",PublicKey=" + - "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" + - "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" + - "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" + - "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" + - "f92cbfb5")] @@ -96,19 +77,22 @@ using System.Windows.Markup; [assembly: XmlnsPrefix("http://schemas.xceed.com/wpf/xaml/toolkit", "xctk")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit")] -[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Converters" )] +[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core")] +[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Converters")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Input" )] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Media")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Utilities")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Chromes")] +[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Converters")] +[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Mag.Converters")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Primitives")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Attributes")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Commands")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Converters")] [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Editors")] -[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox" )] -[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Panels" )] +[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox")] +[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Panels")] #pragma warning disable 1699 diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs index 806d9f65..4cd51195 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -55,6 +56,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes #endregion + public override object TypeId + { + get + { + return this.CategoryValue; + } + } + #endregion #region constructor diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs index 4eb15152..d7a7097e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs index 0d7fe4ac..5d412647 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs index 26673ffc..4486c2bb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs index 16a3a13a..b783205f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs index c28cd169..02eee3a1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs index 5ba0af64..23b5d4c5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs index e5eedbbd..3b4afa6a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs index fa75a25c..1db38e42 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs index 79ec6af1..9d3310e5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs index bcc652e3..ce766577 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs index a4d59497..e32301bb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs index e0b14558..528a5cb2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs index a8f93645..71420738 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs index 473ee4e0..d607d91e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs index 20725efd..7c7ca8cf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs index f656f41c..0ff1ed19 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs index 21948fbb..383c62c5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs index 73f45cd4..f58178bf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs index 7118badc..295f5842 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs index 42ae7b13..dec32a54 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs index 4ab5dd0a..848959b4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs index 48a1f977..0f46d6e1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs index d3145e86..0402d382 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs index 72f90f80..8a940cba 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs index a24619d5..177047e4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs index 5a5675d9..9108c7a0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs index bf525b84..0a76533f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -26,11 +27,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors return new PropertyGridEditorCheckBox(); } - protected override void SetControlProperties( PropertyItem propertyItem ) - { - Editor.Margin = new Thickness( 5, 0, 0, 0 ); - } - protected override void SetValueDependencyProperty() { ValueProperty = CheckBox.IsCheckedProperty; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs index 22f9ec12..6bc01bb0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs index ff7941f1..aaa3a8d9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -24,11 +25,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors return new PropertyGridEditorColorPicker(); } - protected override void SetControlProperties( PropertyItem propertyItem ) - { - Editor.BorderThickness = new System.Windows.Thickness( 0 ); - Editor.DisplayColorAndName = true; - } protected override void SetValueDependencyProperty() { ValueProperty = ColorPicker.SelectedColorProperty; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs index 4f542a43..bd0e2cd8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs index b9e22a2a..84353d74 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs index 5997b50d..6df3b3ac 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs index 447eb176..f1f7afe8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs index 880ad78e..45c63651 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs index d52dafb4..7e51a0cd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -44,7 +45,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors protected override void SetControlProperties( PropertyItem propertyItem ) { - Editor.BorderThickness = new System.Windows.Thickness( 0 ); + // Do not set Editor properties which could not be overriden in a user style. + this.Editor.ValueDataType = this.ValueDataType; this.Editor.Mask = this.Mask; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs index 3aca4e30..7219d310 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -20,12 +21,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors { public class PrimitiveTypeCollectionEditor : TypeEditor { - protected override void SetControlProperties( PropertyItem propertyItem ) - { - Editor.BorderThickness = new System.Windows.Thickness( 0 ); - Editor.Content = "(Collection)"; - } - protected override void SetValueDependencyProperty() { ValueProperty = PrimitiveTypeCollectionControl.ItemsSourceProperty; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs index 7c7e87f3..29297811 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -18,18 +19,24 @@ using System; using System.Collections; using System.ComponentModel; using System.Globalization; +using System.Linq; using System.Windows.Data; namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors { public class SourceComboBoxEditor : ComboBoxEditor { + internal static string ComboBoxNullValue = "Null"; + ICollection _collection; TypeConverter _typeConverter; public SourceComboBoxEditor( ICollection collection, TypeConverter typeConverter ) { - _collection = collection; + // Add a "Null" input value in the ComboBox when using a NullableConverter. + _collection = (typeConverter is NullableConverter) + ? collection.Cast().Select( x => x ?? SourceComboBoxEditor.ComboBoxNullValue ).ToArray() + : collection; _typeConverter = typeConverter; } @@ -40,18 +47,24 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors protected override IValueConverter CreateValueConverter() { - //When using a stringConverter, we need to convert the value - if( (_typeConverter != null) && (_typeConverter is StringConverter) ) - return new SourceComboBoxEditorConverter( _typeConverter ); + if( _typeConverter != null ) + { + //When using a stringConverter, we need to convert the value + if( _typeConverter is StringConverter ) + return new SourceComboBoxEditorStringConverter( _typeConverter ); + //When using a NullableConverter, we need to convert the null value + if( _typeConverter is NullableConverter ) + return new SourceComboBoxEditorNullableConverter(); + } return null; } } - internal class SourceComboBoxEditorConverter : IValueConverter + internal class SourceComboBoxEditorStringConverter : IValueConverter { private TypeConverter _typeConverter; - internal SourceComboBoxEditorConverter( TypeConverter typeConverter ) + internal SourceComboBoxEditorStringConverter( TypeConverter typeConverter ) { _typeConverter = typeConverter; } @@ -76,4 +89,17 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors return value; } } + + internal class SourceComboBoxEditorNullableConverter : IValueConverter + { + public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) + { + return value ?? SourceComboBoxEditor.ComboBoxNullValue; + } + + public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture ) + { + return value.Equals( SourceComboBoxEditor.ComboBoxNullValue ) ? null : value; + } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs index dc2c9b90..3bf79fc3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -30,12 +31,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors { ValueProperty = TextBlock.TextProperty; } - - protected override void SetControlProperties( PropertyItem propertyItem ) - { - Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 ); - Editor.TextTrimming = TextTrimming.CharacterEllipsis; - } } public class PropertyGridEditorTextBlock : TextBlock diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs index 09a3826b..a6512ef4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs index 01c61a4a..55087688 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -75,6 +76,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors protected virtual void SetControlProperties( PropertyItem propertyItem ) { //TODO: implement in derived class + // Do not set Editor properties which could not be overriden in a user style. } protected abstract void SetValueDependencyProperty(); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs index 17f4a63c..745fd0b8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -27,10 +28,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors { public class UpDownEditor : TypeEditor where TEditor : UpDownBase, new() { - protected override void SetControlProperties( PropertyItem propertyItem ) - { - Editor.TextAlignment = System.Windows.TextAlignment.Left; - } protected override void SetValueDependencyProperty() { ValueProperty = UpDownBase.ValueProperty; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs index 916b2c5e..736cf69e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs index 35770f0d..0822d16e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs index 2a823aef..08bd8543 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -135,19 +136,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid private int GetCategoryOrder( object categoryValue ) { - Debug.Assert( SelectedObject != null ); + Debug.Assert( this.SelectedObject != null ); if( categoryValue == null ) return int.MaxValue; int order = int.MaxValue; - object selectedObject = SelectedObject; - CategoryOrderAttribute[] orderAttributes = ( selectedObject != null ) - ? ( CategoryOrderAttribute[] )selectedObject.GetType().GetCustomAttributes( typeof( CategoryOrderAttribute ), true ) - : new CategoryOrderAttribute[ 0 ]; - - var orderAttribute = orderAttributes - .FirstOrDefault( ( a ) => object.Equals( a.CategoryValue, categoryValue ) ); + var orderAttribute = TypeDescriptor.GetAttributes( this.SelectedObject ) + .OfType() + .FirstOrDefault( attribute => Equals( attribute.CategoryValue, categoryValue ) ); if( orderAttribute != null ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs index 6542737a..63ae494b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs index 6bdef100..392fb6c1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs index 69bf3bde..74d3aa43 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs index de577b5f..0cf055c4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs index 6b09500f..cb4de631 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs index 3b47a5fe..54cb253f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs index 79eb3898..f901b294 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs index c4b6a01c..5d9a619f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs index caca0687..ab09c1c3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs index dda2f153..ed931e0f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs index 734ba65d..25f3aa30 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs index ec077065..abf15d31 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml index 56c66699..aaf2e0c2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml @@ -2,10 +2,11 @@ Toolkit for WPF - Copyright (C) 2007-2019 Xceed Software Inc. + Copyright (C) 2007-2020 Xceed Software Inc. - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md For more features, controls, and fast professional support, pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ @@ -59,6 +60,8 @@ @@ -278,16 +287,26 @@ BasedOn="{StaticResource {x:Type TextBlock}}"> + + @@ -284,16 +293,26 @@ BasedOn="{StaticResource {x:Type TextBlock}}"> + +