From 964cdfeb6937292063118ea80e46059f10e19dd4 Mon Sep 17 00:00:00 2001 From: BoucherS_cp Date: Mon, 6 Oct 2014 14:09:46 +0000 Subject: [PATCH] --- .../AssemblyVersionInfo.cs | 2 +- .../Theme.xaml | 7 +- .../AssemblyVersionInfo.cs | 2 +- .../Theme.xaml | 6 +- .../AssemblyVersionInfo.cs | 2 +- .../Theme.xaml | 36 +- .../AssemblyVersionInfo.cs | 2 +- .../Controls/FocusElementManager.cs | 5 - .../Controls/LayoutAnchorableTabItem.cs | 2 - .../Controls/LayoutAutoHideWindowControl.cs | 3 - .../Controls/LayoutDocumentPaneControl.cs | 11 - .../Controls/LayoutFloatingWindowControl.cs | 19 - .../Controls/LayoutGridControl.cs | 8 - .../Controls/LayoutItem.cs | 6 - .../Controls/NavigatorWindow.cs | 1 - .../Controls/OverlayWindow.cs | 2 - .../Xceed.Wpf.AvalonDock/DockingManager.cs | 67 +-- .../Layout/LayoutAnchorable.cs | 15 +- .../Layout/LayoutDocument.cs | 18 +- .../Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs | 32 +- .../Properties/AssemblyInfo.cs | 2 +- .../Xceed.Wpf.AvalonDock/Themes/generic.xaml | 7 +- .../Src/Xceed.Wpf.AvalonDock/Win32Helper.cs | 6 +- .../Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs | 2 +- .../Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs | 6 +- .../CodeFiles/DateTimeView.xaml.txt | 4 + .../CodeFiles/ListBoxView.xaml.txt | 6 +- .../CodeFiles/NumericView.xaml.txt | 1 + ...opertyGridPropertiesSourceView.xaml.cs.txt | 1 - .../CodeFiles/RadialGaugeView.xaml.txt | 2 +- .../CodeFiles/RangeSliderView.xaml.txt | 2 +- .../CodeFiles/RatingView.xaml.txt | 2 +- .../ThemingExtendedToolkitView.xaml.txt | 5 +- .../CodeFiles/ToggleSwitchView.xaml.cs.txt | 38 ++ .../CodeFiles/ToggleSwitchView.xaml.txt | 392 ++++++++++++++++++ .../MainWindow.xaml | 14 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/Resources.resx | 6 +- .../Samples/DateTime/Views/DateTimeView.xaml | 4 + .../Samples/Numeric/Views/NumericView.xaml | 1 + .../RangeSlider/Views/RangeSliderView.xaml | 2 +- .../Views/ThemingExtendedToolkitView.xaml | 1 + .../OpenSourceImages/ToggleSwitch.png | Bin 0 -> 2766 bytes .../ToggleSwitch/Views/ToggleSwitchView.xaml | 64 +++ .../Views/ToggleSwitchView.xaml.cs | 38 ++ .../Xceed.Wpf.Toolkit.LiveExplorer.csproj | 16 +- .../Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs | 2 +- .../Implementation/CollectionControl.cs | 12 +- .../Implementation/CollectionControlButton.cs | 129 ++++++ .../PrimitiveTypeCollectionControl.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 67 ++- .../CollectionControl/Themes/Generic.xaml | 84 +++- .../CornerRadiusToDoubleConverter.cs | 48 +++ .../Converters/ThicknessToDoubleConverter.cs | 48 +++ .../Primitives/MouseWheelActiveTriggerEnum.cs | 1 + .../Core/Primitives/Selector.cs | 10 +- .../Core/Primitives/UpDownBase.cs | 24 +- .../Core/Primitives/WindowContainer.cs | 9 + .../Implementation/DateTimePicker.cs | 68 +++ .../Themes/Aero2.NormalColor.xaml | 28 +- .../DateTimePicker/Themes/Generic.xaml | 2 + .../Implementation/DateTimeParser.cs | 5 +- .../Themes/Aero2.NormalColor.xaml | 7 + .../DropDownButton/Themes/Generic.xaml | 7 + .../Attributes/ExpandableObjectAttribute.cs | 12 + .../Editors/CollectionEditor.cs | 58 +++ .../Editors/CollectionEditor.xaml | 79 ---- .../Editors/CollectionEditor.xaml.cs | 51 --- .../Editors/PrimitiveTypeCollectionEditor.cs | 11 +- .../Implementation/ObjectContainerHelper.cs | 1 - .../ObjectContainerHelperBase.cs | 4 + .../Implementation/PropertyGrid.cs | 4 + .../Themes/Aero2.NormalColor.xaml | 19 +- .../PropertyGrid/Themes/Generic.xaml | 20 +- .../RichTextBoxFormatBar.cs | 10 +- .../SplitButton/Themes/Aero2.NormalColor.xaml | 20 +- .../SplitButton/Themes/Generic.xaml | 6 + .../Xceed.Wpf.Toolkit.csproj | 11 +- .../Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs | 3 + .../Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs | 2 +- .../Implementation/CollectionControl.cs | 12 +- .../Implementation/CollectionControlButton.cs | 129 ++++++ .../PrimitiveTypeCollectionControl.cs | 11 +- .../Themes/Aero2.NormalColor.xaml | 67 ++- .../CollectionControl/Themes/Generic.xaml | 84 +++- .../ColorPicker/Themes/Aero2.NormalColor.xaml | 5 +- .../ColorPicker/Themes/Generic.xaml | 5 +- .../CornerRadiusToDoubleConverter.cs | 48 +++ .../Converters/ThicknessToDoubleConverter.cs | 48 +++ .../Primitives/MouseWheelActiveTriggerEnum.cs | 1 + .../Core/Primitives/Selector.cs | 10 +- .../Core/Primitives/UpDownBase.cs | 24 +- .../Core/Primitives/WindowContainer.cs | 9 + .../Implementation/DateTimePicker.cs | 68 +++ .../Implementation/DateTimeParser.cs | 5 +- .../Themes/Aero2.NormalColor.xaml | 7 + .../DropDownButton/Themes/Generic.xaml | 7 + .../Attributes/ExpandableObjectAttribute.cs | 12 + .../Editors/CollectionEditor.cs | 58 +++ .../Editors/CollectionEditor.xaml | 79 ---- .../Editors/CollectionEditor.xaml.cs | 51 --- .../Editors/PrimitiveTypeCollectionEditor.cs | 11 +- .../Implementation/ObjectContainerHelper.cs | 1 - .../ObjectContainerHelperBase.cs | 4 + .../Implementation/PropertyGrid.cs | 4 + .../Implementation/PropertyGridUtilities.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 19 +- .../PropertyGrid/Themes/Generic.xaml | 20 +- .../RangeSlider/Implementation/RangeSlider.cs | 10 +- .../RangeSlider/Themes/Aero2.NormalColor.xaml | 52 +++ .../RangeSlider/Themes/Generic.xaml | 371 ++++++++++++----- .../RichTextBoxFormatBar.cs | 10 +- .../SplitButton/Themes/Aero2.NormalColor.xaml | 20 +- .../SplitButton/Themes/Generic.xaml | 6 + .../Xceed.Wpf.Toolkit.csproj | 14 +- .../Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs | 3 + 116 files changed, 2383 insertions(+), 640 deletions(-) create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.cs.txt create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/OpenSourceImages/ToggleSwitch.png create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs delete mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml delete mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs create mode 100644 ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs create mode 100644 ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs create mode 100644 ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs create mode 100644 ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs delete mode 100644 ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml delete mode 100644 ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs index 94a1dcce..ce1db48a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "2.2"; + public const string BaseVersion = "2.3"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml index 7a63343e..ad4106da 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml @@ -813,10 +813,9 @@ - - + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs index 94a1dcce..ce1db48a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "2.2"; + public const string BaseVersion = "2.3"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml index eafa0cdf..2ee472f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml @@ -855,8 +855,10 @@ - - + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs index 94a1dcce..ce1db48a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "2.2"; + public const string BaseVersion = "2.3"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml index ba980a28..63443a48 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml @@ -201,7 +201,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml index 3e202171..2c85e339 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml @@ -529,8 +529,7 @@ + SampleType="{x:Type samples:TimeSpan.Views.TimeSpanView}"/> + SampleType="{x:Type samples:RangeSlider.Views.RangeSliderView}"/> + @@ -616,8 +617,7 @@ + IsPlusOnlyFeature="True"> text/microsoft-resx - 2.0 + 2.3 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml index a4220619..6af5c431 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml @@ -67,6 +67,7 @@ + @@ -87,6 +88,8 @@ + + @@ -116,6 +119,7 @@ AutoCloseCalendar="{Binding IsChecked, ElementName=_autoCloseCalendar}" ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}" TimePickerVisibility="{Binding Source={x:Reference _timePickerVisibility}, Path=SelectedItem}" + TimePickerShowButtonSpinner="{Binding IsChecked, ElementName=_timePickerShowButtonSpinner}" Minimum="{Binding Value, ElementName=_minimum}" Maximum="{Binding Value, ElementName=_maximum}"/> diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml index 8a447fa8..e427b107 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml @@ -109,6 +109,7 @@ + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml index 75aafa0f..80358c2e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml @@ -439,7 +439,7 @@ - The RangeSlider control let you sets a range with 2 slider thumbs. The lower limit is marked with the right side of the left thumb while the higher limit is marked with the left side of the right thumb. + The RangeSlider control lets you set a range with 2 slider thumbs. The lower limit is marked with the right side of the left thumb while the higher limit is marked with the left side of the right thumb. diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml index cc62fee6..d6ac1e07 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml @@ -59,6 +59,7 @@ + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/OpenSourceImages/ToggleSwitch.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/OpenSourceImages/ToggleSwitch.png new file mode 100644 index 0000000000000000000000000000000000000000..502bc2e30457f4be8ff4884d2fe223000db72301 GIT binary patch literal 2766 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 literal 0 HcmV?d00001 diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml new file mode 100644 index 00000000..2da0f101 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml @@ -0,0 +1,64 @@ + + + + + + + The ToggleSwitch control is a fully customizable on/off switch that can be used to enhance the UI experience. + + + This feature is only available in the "Plus" version. + + + Click here for more details about Xceed Extended WPF Toolkit Plus. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs new file mode 100644 index 00000000..8e383128 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs @@ -0,0 +1,38 @@ +/************************************************************************************* + + Extended WPF Toolkit + + Copyright (C) 2007-2014 Xceed Software Inc. + + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license + + For more features, controls, and fast professional support, + pick up the Plus Edition at http://xceed.com/wpf_toolkit + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + + ***********************************************************************************/ + +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; +using System.Windows.Controls; +using System; +using System.Windows; +using System.Windows.Media; +using System.Windows.Documents; + +namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views +{ + /// + /// Interaction logic for ToggleSwitchView.xaml + /// + public partial class ToggleSwitchView : DemoView + { + public ToggleSwitchView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj index ad84fe54..69a3d3db 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj @@ -320,6 +320,9 @@ TimeSpanView.xaml + + ToggleSwitchView.xaml + @@ -623,6 +626,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -1030,13 +1037,20 @@ - + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs index 94a1dcce..ce1db48a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "2.2"; + public const string BaseVersion = "2.3"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs index cd3ae99c..20907e41 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs @@ -100,7 +100,12 @@ namespace Xceed.Wpf.Toolkit if( newValue != null ) { foreach( var item in newValue ) - Items.Add( item ); + { + if( item != null ) + { + Items.Add( item ); + } + } } } @@ -368,7 +373,10 @@ namespace Xceed.Wpf.Toolkit if( ItemsSourceType != null ) { ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes ); - list = ( IList )constructor.Invoke( null ); + if( constructor != null ) + { + list = ( IList )constructor.Invoke( null ); + } } return list; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs new file mode 100644 index 00000000..d505604a --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs @@ -0,0 +1,129 @@ +/************************************************************************************* + + Extended WPF Toolkit + + Copyright (C) 2007-2013 Xceed Software Inc. + + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license + + For more features, controls, and fast professional support, + pick up the Plus Edition at http://xceed.com/wpf_toolkit + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + + ***********************************************************************************/ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; + +namespace Xceed.Wpf.Toolkit +{ + public class CollectionControlButton : Button + { + #region Constructors + + static CollectionControlButton() + { + DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionControlButton ), new FrameworkPropertyMetadata( typeof( CollectionControlButton ) ) ); + } + + public CollectionControlButton() + { + this.Click += this.CollectionControlButton_Click; + } + + #endregion //Constructors + + #region Properties + + #region IsReadOnly Property + + public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlButton ), new UIPropertyMetadata( false ) ); + public bool IsReadOnly + { + get + { + return ( bool )GetValue( IsReadOnlyProperty ); + } + set + { + SetValue( IsReadOnlyProperty, value ); + } + } + + #endregion //IsReadOnly + + #region ItemsSource Property + + public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) ); + public IList ItemsSource + { + get + { + return ( IList )GetValue( ItemsSourceProperty ); + } + set + { + SetValue( ItemsSourceProperty, value ); + } + } + + #endregion //ItemsSource + + #region ItemsSourceType Property + + public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) ); + public Type ItemsSourceType + { + get + { + return ( Type )GetValue( ItemsSourceTypeProperty ); + } + set + { + SetValue( ItemsSourceTypeProperty, value ); + } + } + + #endregion //ItemsSourceType + + #region NewItemTypes Property + + public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) ); + public IList NewItemTypes + { + get + { + return ( IList )GetValue( NewItemTypesProperty ); + } + set + { + SetValue( NewItemTypesProperty, value ); + } + } + + #endregion //NewItemTypes + + #endregion + + #region Methods + + private void CollectionControlButton_Click( object sender, RoutedEventArgs e ) + { + CollectionControlDialog collectionControlDialog = new CollectionControlDialog(); + collectionControlDialog.ItemsSource = this.ItemsSource; + collectionControlDialog.NewItemTypes = this.NewItemTypes; + collectionControlDialog.ItemsSourceType = this.ItemsSourceType; + collectionControlDialog.IsReadOnly = this.IsReadOnly; + collectionControlDialog.ShowDialog(); + } + + #endregion + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs index 10cb60cc..42ff42e8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs @@ -94,7 +94,7 @@ namespace Xceed.Wpf.Toolkit if( ItemsSourceType == null ) ItemsSourceType = newValue.GetType(); - if( ItemType == null ) + if( ItemType == null && newValue.GetType().ContainsGenericParameters ) ItemType = newValue.GetType().GetGenericArguments()[ 0 ]; SetText( newValue ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml index d3a66df0..85272fb1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml @@ -20,6 +20,7 @@ xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters" xmlns:colconv="clr-namespace:Xceed.Wpf.Toolkit.Converters" xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes" + xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes" xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid"> @@ -138,7 +139,7 @@ - + + + - + + + - - - + Grid.Column="1" + IsTabStop="False" + IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" + IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"> @@ -79,11 +82,12 @@ + RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}" + RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}"> diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml index 99642ce8..892a94a5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml @@ -49,6 +49,7 @@ + @@ -68,7 +69,10 @@ Designer MSBuild:Compile - - MSBuild:Compile - Designer - Designer MSBuild:Compile @@ -392,6 +388,7 @@ + CollectionControlDialog.xaml @@ -404,7 +401,10 @@ + + + @@ -565,9 +565,6 @@ - - CollectionEditor.xaml - diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs index d521dba6..2ae3cbdb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs @@ -3315,6 +3315,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox if( _content == null ) return; + if( double.IsNaN( scale ) ) + return; + // if necessary, verify that the relativeTo point falls within the content if( restrictRelativePointToContent && !( new Rect( _content.RenderSize ) ).Contains( relativeTo ) ) return; diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs index 94a1dcce..ce1db48a 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "2.2"; + public const string BaseVersion = "2.3"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs index cd3ae99c..20907e41 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs @@ -100,7 +100,12 @@ namespace Xceed.Wpf.Toolkit if( newValue != null ) { foreach( var item in newValue ) - Items.Add( item ); + { + if( item != null ) + { + Items.Add( item ); + } + } } } @@ -368,7 +373,10 @@ namespace Xceed.Wpf.Toolkit if( ItemsSourceType != null ) { ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes ); - list = ( IList )constructor.Invoke( null ); + if( constructor != null ) + { + list = ( IList )constructor.Invoke( null ); + } } return list; diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs new file mode 100644 index 00000000..d505604a --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs @@ -0,0 +1,129 @@ +/************************************************************************************* + + Extended WPF Toolkit + + Copyright (C) 2007-2013 Xceed Software Inc. + + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license + + For more features, controls, and fast professional support, + pick up the Plus Edition at http://xceed.com/wpf_toolkit + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + + ***********************************************************************************/ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; + +namespace Xceed.Wpf.Toolkit +{ + public class CollectionControlButton : Button + { + #region Constructors + + static CollectionControlButton() + { + DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionControlButton ), new FrameworkPropertyMetadata( typeof( CollectionControlButton ) ) ); + } + + public CollectionControlButton() + { + this.Click += this.CollectionControlButton_Click; + } + + #endregion //Constructors + + #region Properties + + #region IsReadOnly Property + + public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlButton ), new UIPropertyMetadata( false ) ); + public bool IsReadOnly + { + get + { + return ( bool )GetValue( IsReadOnlyProperty ); + } + set + { + SetValue( IsReadOnlyProperty, value ); + } + } + + #endregion //IsReadOnly + + #region ItemsSource Property + + public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) ); + public IList ItemsSource + { + get + { + return ( IList )GetValue( ItemsSourceProperty ); + } + set + { + SetValue( ItemsSourceProperty, value ); + } + } + + #endregion //ItemsSource + + #region ItemsSourceType Property + + public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) ); + public Type ItemsSourceType + { + get + { + return ( Type )GetValue( ItemsSourceTypeProperty ); + } + set + { + SetValue( ItemsSourceTypeProperty, value ); + } + } + + #endregion //ItemsSourceType + + #region NewItemTypes Property + + public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) ); + public IList NewItemTypes + { + get + { + return ( IList )GetValue( NewItemTypesProperty ); + } + set + { + SetValue( NewItemTypesProperty, value ); + } + } + + #endregion //NewItemTypes + + #endregion + + #region Methods + + private void CollectionControlButton_Click( object sender, RoutedEventArgs e ) + { + CollectionControlDialog collectionControlDialog = new CollectionControlDialog(); + collectionControlDialog.ItemsSource = this.ItemsSource; + collectionControlDialog.NewItemTypes = this.NewItemTypes; + collectionControlDialog.ItemsSourceType = this.ItemsSourceType; + collectionControlDialog.IsReadOnly = this.IsReadOnly; + collectionControlDialog.ShowDialog(); + } + + #endregion + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs index be732359..42ff42e8 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs @@ -94,7 +94,7 @@ namespace Xceed.Wpf.Toolkit if( ItemsSourceType == null ) ItemsSourceType = newValue.GetType(); - if( ItemType == null ) + if( ItemType == null && newValue.GetType().ContainsGenericParameters ) ItemType = newValue.GetType().GetGenericArguments()[ 0 ]; SetText( newValue ); @@ -234,7 +234,14 @@ namespace Xceed.Wpf.Toolkit object value = null; try { - value = Convert.ChangeType( valueString, ItemType ); + if( ItemType.IsEnum ) + { + value = Enum.Parse( ItemType, valueString ); + } + else + { + value = Convert.ChangeType( valueString, ItemType ); + } } catch { diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml index d3a66df0..85272fb1 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml @@ -20,6 +20,7 @@ xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters" xmlns:colconv="clr-namespace:Xceed.Wpf.Toolkit.Converters" xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes" + xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes" xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid"> @@ -138,7 +139,7 @@ - + + + - + + + - - -