diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/BusyIndicator.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/BusyIndicator.xaml new file mode 100644 index 00000000..a43fa9e1 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/BusyIndicator.xaml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Collapsed + + + + + + + Collapsed + + + + + + + + + + + Visible + + + + + + + Visible + + + + + + + + + + + + + True + + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxCheckedChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxCheckedChangedEventArgs.cs new file mode 100644 index 00000000..7450379c --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxCheckedChangedEventArgs.cs @@ -0,0 +1,17 @@ +using System; +using System.Windows; + +namespace Microsoft.Windows.Controls +{ + public delegate void CheckListBoxCheckedChangedEventHandler(object sender, CheckListBoxCheckedChangedEventArgs e); + public class CheckListBoxCheckedChangedEventArgs : RoutedEventArgs + { + public object Item { get; private set; } + + public CheckListBoxCheckedChangedEventArgs(RoutedEvent routedEvent, object source, object item) + : base(routedEvent, source) + { + Item = item; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs new file mode 100644 index 00000000..1993c7ca --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Controls.Primitives; + +namespace Microsoft.Windows.Controls +{ + public class CheckListBoxItem : ContentControl + { + static CheckListBoxItem() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(CheckListBoxItem), new FrameworkPropertyMetadata(typeof(CheckListBoxItem))); + } + + public CheckListBoxItem() + { + AddHandler(Mouse.MouseDownEvent, new MouseButtonEventHandler(CheckListBoxItem_MouseDown)); + } + + #region Properties + + public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register("IsChecked", typeof(bool), typeof(CheckListBoxItem), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsSelectedChanged)); + public bool IsChecked + { + get { return (bool)GetValue(IsCheckedProperty); } + set { SetValue(IsCheckedProperty, value); } + } + + private static void OnIsSelectedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e) + { + CheckListBoxItem checkListBoxItem = o as CheckListBoxItem; + if (checkListBoxItem != null) + checkListBoxItem.OnIsSelectedChanged((bool)e.OldValue, (bool)e.NewValue); + } + + protected virtual void OnIsSelectedChanged(bool oldValue, bool newValue) + { + if (newValue) + RaiseSelectionChangedEvent(new RoutedEventArgs(CheckListBox.CheckedEvent, this)); + else + RaiseSelectionChangedEvent(new RoutedEventArgs(CheckListBox.UncheckedEvent, this)); + } + + #endregion //Properties + + #region Events + + public static readonly RoutedEvent SelectedEvent = CheckListBox.CheckedEvent.AddOwner(typeof(CheckListBoxItem)); + public static readonly RoutedEvent UnselectedEvent = CheckListBox.UncheckedEvent.AddOwner(typeof(CheckListBoxItem)); + + #endregion + + #region Event Hanlders + + void CheckListBoxItem_MouseDown(object sender, MouseButtonEventArgs e) + { + IsChecked = !IsChecked; + } + + #endregion //Event Hanlders + + #region Methods + + private void RaiseSelectionChangedEvent(RoutedEventArgs e) + { + base.RaiseEvent(e); + } + + #endregion //Methods + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/ChildWindow.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/ChildWindow.xaml new file mode 100644 index 00000000..45bcc828 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/ChildWindow.xaml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/VisualStates.ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/VisualStates.ChildWindow.cs new file mode 100644 index 00000000..eb3a4ea9 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/VisualStates.ChildWindow.cs @@ -0,0 +1,22 @@ +using System; + +namespace Microsoft.Windows.Controls +{ + internal static partial class VisualStates + { + /// + /// Window State group name. + /// + public const string WindowStatesGroup = "WindowStatesGroup"; + + /// + /// Open state name for ChildWindow. + /// + public const string Open = "Open"; + + /// + /// Closed state name for ChildWindow. + /// + public const string Closed = "Closed"; + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.xaml new file mode 100644 index 00000000..7b07bb77 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.xaml @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/ColorSpectrumSlider.cs new file mode 100644 index 00000000..c4eac2d8 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/ColorSpectrumSlider.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; +using System.Windows.Shapes; + +namespace Microsoft.Windows.Controls +{ + internal class ColorSpectrumSlider : Slider + { + #region Private Members + + private Rectangle _spectrumDisplay; + private LinearGradientBrush _pickerBrush; + + #endregion //Private Members + + #region Constructors + + static ColorSpectrumSlider() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(ColorSpectrumSlider), new FrameworkPropertyMetadata(typeof(ColorSpectrumSlider))); + } + + #endregion //Constructors + + #region Dependency Properties + + public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorSpectrumSlider), new PropertyMetadata(System.Windows.Media.Colors.Transparent)); + public Color SelectedColor + { + get { return (Color)GetValue(SelectedColorProperty); } + set { SetValue(SelectedColorProperty, value); } + } + + #endregion //Dependency Properties + + #region Base Class Overrides + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + _spectrumDisplay = (Rectangle)GetTemplateChild("PART_SpectrumDisplay"); + CreateSpectrum(); + OnValueChanged(Double.NaN, Value); + } + + protected override void OnValueChanged(double oldValue, double newValue) + { + base.OnValueChanged(oldValue, newValue); + + Color color = ColorUtilities.ConvertHsvToRgb(360 - newValue, 1, 1); + SelectedColor = color; + } + + #endregion //Base Class Overrides + + #region Methods + + private void CreateSpectrum() + { + _pickerBrush = new LinearGradientBrush(); + _pickerBrush.StartPoint = new Point(0.5, 0); + _pickerBrush.EndPoint = new Point(0.5, 1); + _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation; + + List colorsList = ColorUtilities.GenerateHsvSpectrum(); + + double stopIncrement = (double)1 / colorsList.Count; + + int i; + for (i = 0; i < colorsList.Count; i++) + { + _pickerBrush.GradientStops.Add(new GradientStop(colorsList[i], i * stopIncrement)); + } + + _pickerBrush.GradientStops[i - 1].Offset = 1.0; + _spectrumDisplay.Fill = _pickerBrush; + } + + #endregion //Methods + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/HsvColor.cs new file mode 100644 index 00000000..eed5c3bd --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/HsvColor.cs @@ -0,0 +1,18 @@ +using System; + +namespace Microsoft.Windows.Controls +{ + internal struct HsvColor + { + public double H; + public double S; + public double V; + + public HsvColor(double h, double s, double v) + { + H = h; + S = s; + V = v; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml new file mode 100644 index 00000000..9f6dac6a --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/MessageBox.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/MessageBox.xaml new file mode 100644 index 00000000..7223ba9c --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/MessageBox.xaml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs new file mode 100644 index 00000000..8917394e --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.261 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Xceed.Wpf.Toolkit.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xceed.Wpf.Toolkit.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.resx b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.resx new file mode 100644 index 00000000..ffecec85 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs new file mode 100644 index 00000000..6ec402eb --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.261 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Xceed.Wpf.Toolkit.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.settings b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.settings new file mode 100644 index 00000000..8f2fd95d --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/TypeEditorAttribute.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/TypeEditorAttribute.cs new file mode 100644 index 00000000..26bbd28f --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/TypeEditorAttribute.cs @@ -0,0 +1,18 @@ +using System; + +namespace Microsoft.Windows.Controls.PropertyGrid.Attributes +{ + public class TypeEditorAttribute : Attribute + { + public Type Type { get; set; } + + public TypeEditorAttribute(Type type) + { + var valueSourceInterface = type.GetInterface("Microsoft.Windows.Controls.PropertyGrid.Editors.ITypeEditor"); + if (valueSourceInterface == null) + throw new ArgumentException("Type must implement the ITypeEditor interface.", "type"); + + Type = type; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/CheckBoxEditorProvider.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/CheckBoxEditorProvider.cs new file mode 100644 index 00000000..4d80b084 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/CheckBoxEditorProvider.cs @@ -0,0 +1,45 @@ +using System; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows; + +namespace Microsoft.Windows.Controls.PropertyGrid.Implementation.EditorProviders +{ + public class CheckBoxEditorProvider : ITypeEditorProvider + { + CheckBox _checkbox; + + public CheckBoxEditorProvider() + { + _checkbox = new CheckBox(); + _checkbox.Margin = new Thickness(2, 0, 0, 0); + } + + public void Initialize(PropertyItem propertyItem) + { + ResolveBinding(propertyItem); + } + + public FrameworkElement ResolveEditor() + { + return _checkbox; + } + + private void ResolveBinding(PropertyItem property) + { + var binding = new Binding(property.Name); + binding.Source = property.Instance; + binding.ValidatesOnExceptions = true; + binding.ValidatesOnDataErrors = true; + + if (property.IsWriteable) + binding.Mode = BindingMode.TwoWay; + else + binding.Mode = BindingMode.OneWay; + + BindingOperations.SetBinding(_checkbox, CheckBox.IsCheckedProperty, binding); + } + + + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/EnumComboBoxEditorProvider.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/EnumComboBoxEditorProvider.cs new file mode 100644 index 00000000..17301263 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/EnumComboBoxEditorProvider.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Controls; +using System.Windows; +using System.Windows.Data; +using System.Reflection; + +namespace Microsoft.Windows.Controls.PropertyGrid.Implementation.EditorProviders +{ + public class EnumComboBoxEditorProvider : ITypeEditorProvider + { + ComboBox _comboBox; + + public EnumComboBoxEditorProvider() + { + _comboBox = new ComboBox(); + } + + public void Initialize(PropertyItem propertyItem) + { + ResolveBinding(propertyItem); + SetItemsSource(propertyItem); + } + + public FrameworkElement ResolveEditor() + { + return _comboBox; + } + + private void ResolveBinding(PropertyItem property) + { + var binding = new Binding(property.Name); + binding.Source = property.Instance; + binding.ValidatesOnExceptions = true; + binding.ValidatesOnDataErrors = true; + + if (property.IsWriteable) + binding.Mode = BindingMode.TwoWay; + else + binding.Mode = BindingMode.OneWay; + + BindingOperations.SetBinding(_comboBox, ComboBox.SelectedItemProperty, binding); + } + + private void SetItemsSource(PropertyItem property) + { + _comboBox.ItemsSource = GetValues(property.PropertyType); + } + + public static object[] GetValues(Type enumType) + { + List values = new List(); + + var fields = from field in enumType.GetFields() + where field.IsLiteral + select field; + + foreach (FieldInfo field in fields) + { + values.Add(field.GetValue(enumType)); + } + + return values.ToArray(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/FontComboBoxEditorProvider.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/FontComboBoxEditorProvider.cs new file mode 100644 index 00000000..a6c06394 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/FontComboBoxEditorProvider.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Windows.Controls; +using System.Windows; +using System.Windows.Data; +using System.Windows.Media; + +namespace Microsoft.Windows.Controls.PropertyGrid.Implementation.EditorProviders +{ + public class FontComboBoxEditorProvider : ITypeEditorProvider + { + ComboBox _comboBox; + + public FontComboBoxEditorProvider() + { + _comboBox = new ComboBox(); + } + + public void Initialize(PropertyItem propertyItem) + { + ResolveBinding(propertyItem); + SetItemsSource(propertyItem); + } + + public FrameworkElement ResolveEditor() + { + return _comboBox; + } + + private void ResolveBinding(PropertyItem property) + { + var binding = new Binding(property.Name); + binding.Source = property.Instance; + binding.ValidatesOnExceptions = true; + binding.ValidatesOnDataErrors = true; + + if (property.IsWriteable) + binding.Mode = BindingMode.TwoWay; + else + binding.Mode = BindingMode.OneWay; + + BindingOperations.SetBinding(_comboBox, ComboBox.SelectedItemProperty, binding); + } + + private void SetItemsSource(PropertyItem property) + { + if (property.PropertyType == typeof(FontFamily)) + { + List fonts = new List(); + fonts.Add(new FontFamily("Arial")); + fonts.Add(new FontFamily("Courier New")); + fonts.Add(new FontFamily("Times New Roman")); + fonts.Add(new FontFamily("Batang")); + fonts.Add(new FontFamily("BatangChe")); + fonts.Add(new FontFamily("DFKai-SB")); + fonts.Add(new FontFamily("Dotum")); + fonts.Add(new FontFamily("DutumChe")); + fonts.Add(new FontFamily("FangSong")); + fonts.Add(new FontFamily("GulimChe")); + fonts.Add(new FontFamily("Gungsuh")); + fonts.Add(new FontFamily("GungsuhChe")); + fonts.Add(new FontFamily("KaiTi")); + fonts.Add(new FontFamily("Malgun Gothic")); + fonts.Add(new FontFamily("Meiryo")); + fonts.Add(new FontFamily("Microsoft JhengHei")); + fonts.Add(new FontFamily("Microsoft YaHei")); + fonts.Add(new FontFamily("MingLiU")); + fonts.Add(new FontFamily("MingLiu_HKSCS")); + fonts.Add(new FontFamily("MingLiu_HKSCS-ExtB")); + fonts.Add(new FontFamily("MingLiu-ExtB")); + _comboBox.ItemsSource = fonts; + } + else if (property.PropertyType == typeof(FontWeight)) + { + List list = new List() + { + FontWeights.Black, FontWeights.Bold, FontWeights.ExtraBlack, FontWeights.ExtraBold, + FontWeights.ExtraLight, FontWeights.Light, FontWeights.Medium, FontWeights.Normal, FontWeights.SemiBold, + FontWeights.Thin + }; + _comboBox.ItemsSource = list; + } + else if (property.PropertyType == typeof(FontStyle)) + { + List list = new List() + { + FontStyles.Italic, + FontStyles.Normal + }; + _comboBox.ItemsSource = list; + } + else if (property.PropertyType == typeof(FontStretch)) + { + List list = new List() + { + FontStretches.Condensed, + FontStretches.Expanded, + FontStretches.ExtraCondensed, + FontStretches.ExtraExpanded, + FontStretches.Normal, + FontStretches.SemiCondensed, + FontStretches.SemiExpanded, + FontStretches.UltraCondensed, + FontStretches.UltraExpanded + }; + _comboBox.ItemsSource = list; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/ITypeEditorProvider.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/ITypeEditorProvider.cs new file mode 100644 index 00000000..5c629e96 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/ITypeEditorProvider.cs @@ -0,0 +1,11 @@ +using System; +using System.Windows; + +namespace Microsoft.Windows.Controls.PropertyGrid.Implementation.EditorProviders +{ + interface ITypeEditorProvider + { + void Initialize(PropertyItem propertyItem); + FrameworkElement ResolveEditor(); + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/NumericUpDownEditorProvider.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/NumericUpDownEditorProvider.cs new file mode 100644 index 00000000..8dd8a3d6 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/NumericUpDownEditorProvider.cs @@ -0,0 +1,41 @@ +using System; +using System.Windows.Data; +using System.Windows; + +namespace Microsoft.Windows.Controls.PropertyGrid.Implementation.EditorProviders +{ + public class NumericUpDownEditorProvider : ITypeEditorProvider + { + NumericUpDown _numericUpDown; + + public NumericUpDownEditorProvider() + { + _numericUpDown = new NumericUpDown(); + } + + public void Initialize(PropertyItem propertyItem) + { + ResolveBinding(propertyItem); + } + + public FrameworkElement ResolveEditor() + { + return _numericUpDown; + } + + private void ResolveBinding(PropertyItem property) + { + var binding = new Binding(property.Name); + binding.Source = property.Instance; + binding.ValidatesOnExceptions = true; + binding.ValidatesOnDataErrors = true; + + if (property.IsWriteable) + binding.Mode = BindingMode.TwoWay; + else + binding.Mode = BindingMode.OneWay; + + BindingOperations.SetBinding(_numericUpDown, NumericUpDown.ValueProperty, binding); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/TextBoxEditorProvider.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/TextBoxEditorProvider.cs new file mode 100644 index 00000000..c475713d --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorProviders/TextBoxEditorProvider.cs @@ -0,0 +1,42 @@ +using System; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows; + +namespace Microsoft.Windows.Controls.PropertyGrid.Implementation.EditorProviders +{ + public class TextBoxEditorProvider : ITypeEditorProvider + { + FrameworkElement _editor; + + public TextBoxEditorProvider() + { + _editor = new TextBox(); + } + + public void Initialize(PropertyItem propertyItem) + { + ResolveBinding(propertyItem); + } + + public FrameworkElement ResolveEditor() + { + return _editor; + } + + private void ResolveBinding(PropertyItem property) + { + var binding = new Binding(property.Name); + binding.Source = property.Instance; + binding.ValidatesOnExceptions = true; + binding.ValidatesOnDataErrors = true; + + if (property.IsWriteable) + binding.Mode = BindingMode.TwoWay; + else + binding.Mode = BindingMode.OneWay; + + BindingOperations.SetBinding(_editor, TextBox.TextProperty, binding); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs new file mode 100644 index 00000000..1aafa787 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs @@ -0,0 +1,33 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors +{ + public class DateTimeUpDownEditor : TypeEditor + { + protected override void SetControlProperties() + { + Editor.BorderThickness = new System.Windows.Thickness( 0 ); + } + protected override void SetValueDependencyProperty() + { + ValueProperty = DateTimeUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs new file mode 100644 index 00000000..b778bcfc --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs @@ -0,0 +1,34 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors +{ + public class DecimalUpDownEditor : TypeEditor + { + protected override void SetControlProperties() + { + Editor.BorderThickness = new System.Windows.Thickness( 0 ); + } + + protected override void SetValueDependencyProperty() + { + ValueProperty = DecimalUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs new file mode 100644 index 00000000..ce2b6ded --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs @@ -0,0 +1,34 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors +{ + public class DoubleUpDownEditor : TypeEditor + { + protected override void SetControlProperties() + { + Editor.BorderThickness = new System.Windows.Thickness( 0 ); + } + + protected override void SetValueDependencyProperty() + { + ValueProperty = DoubleUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs new file mode 100644 index 00000000..6d4c6491 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs @@ -0,0 +1,33 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors +{ + public class IntegerUpDownEditor : TypeEditor + { + protected override void SetControlProperties() + { + Editor.BorderThickness = new System.Windows.Thickness( 0 ); + } + protected override void SetValueDependencyProperty() + { + ValueProperty = IntegerUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/NumericUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/NumericUpDownEditor.cs new file mode 100644 index 00000000..283106bd --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/NumericUpDownEditor.cs @@ -0,0 +1,12 @@ +using System; + +namespace Microsoft.Windows.Controls.PropertyGrid.Editors +{ + public class NumericUpDownEditor : TypeEditor + { + protected override void SetValueDependencyProperty() + { + ValueProperty = NumericUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/IEditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/IEditorDefinition.cs new file mode 100644 index 00000000..5d8c0039 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/IEditorDefinition.cs @@ -0,0 +1,12 @@ +using System; +using System.Windows; + +namespace Microsoft.Windows.Controls.PropertyGrid +{ + public interface IEditorDefinition + { + DataTemplate EditorTemplate { get; set; } + PropertyDefinitionCollection PropertiesDefinitions { get; set; } + Type TargetType { get; set; } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyCategoryItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyCategoryItem.cs new file mode 100644 index 00000000..27089598 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyCategoryItem.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Windows.Controls; +using System.Windows; + +namespace Microsoft.Windows.Controls.PropertyGrid +{ + public class PropertyCategoryItem : Control + { + public static readonly DependencyProperty CategoryProperty = DependencyProperty.Register("Category", typeof(string), typeof(PropertyCategoryItem), new UIPropertyMetadata(String.Empty, new PropertyChangedCallback(OnCategoryChanged), new CoerceValueCallback(OnCoerceCategory))); + + private static object OnCoerceCategory(DependencyObject o, object value) + { + PropertyCategoryItem propertyCategoryItem = o as PropertyCategoryItem; + if (propertyCategoryItem != null) + return propertyCategoryItem.OnCoerceCategory((string)value); + else + return value; + } + + private static void OnCategoryChanged(DependencyObject o, DependencyPropertyChangedEventArgs e) + { + PropertyCategoryItem propertyCategoryItem = o as PropertyCategoryItem; + if (propertyCategoryItem != null) + propertyCategoryItem.OnCategoryChanged((string)e.OldValue, (string)e.NewValue); + } + + protected virtual string OnCoerceCategory(string value) + { + // TODO: Keep the proposed value within the desired range. + return value; + } + + protected virtual void OnCategoryChanged(string oldValue, string newValue) + { + // TODO: Add your property changed side-effects. Descendants can override as well. + } + + public string Category + { + // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property! + get + { + return (string)GetValue(CategoryProperty); + } + set + { + SetValue(CategoryProperty, value); + } + } + + + private List _Properties = new List(); + public List Properties + { + get + { + return _Properties; + } + set + { + _Properties = value; + } + } + + + static PropertyCategoryItem() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(PropertyCategoryItem), new FrameworkPropertyMetadata(typeof(PropertyCategoryItem))); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml new file mode 100644 index 00000000..314e9102 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml.cs new file mode 100644 index 00000000..a0cfef85 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml.cs @@ -0,0 +1,148 @@ +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Documents; +using System.Windows.Media; +using System.Windows.Controls.Primitives; + +namespace Microsoft.Windows.Controls.Formatting +{ + /// + /// Interaction logic for FormatToolbar.xaml + /// + public partial class FormatToolbar : UserControl + { + #region Properties + + public static readonly DependencyProperty RichTextBoxProperty = DependencyProperty.Register("RichTextBox", typeof(RichTextBox), typeof(FormatToolbar)); + public RichTextBox RichTextBox + { + get { return (RichTextBox)GetValue(RichTextBoxProperty); } + set { SetValue(RichTextBoxProperty, value); } + } + + public double[] FontSizes + { + get + { + return new double[] { + 3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, + 10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0, + 16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0, + 32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0, + 80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0 + }; + } + } + + #endregion + + #region Constructors + + public FormatToolbar(RichTextBox richTextBox) + { + InitializeComponent(); + Loaded += FormatToolbar_Loaded; + RichTextBox = richTextBox; + RichTextBox.SelectionChanged += RichTextBox_SelectionChanged; + } + + #endregion //Constructors + + #region Event Hanlders + + void FormatToolbar_Loaded(object sender, RoutedEventArgs e) + { + _cmbFontFamilies.ItemsSource = System.Windows.Media.Fonts.SystemFontFamilies; + _cmbFontSizes.ItemsSource = FontSizes; + } + + private void FontFamily_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + if (e.AddedItems.Count == 0) + return; + + FontFamily editValue = (FontFamily)e.AddedItems[0]; + ApplyPropertyValueToSelectedText(TextElement.FontFamilyProperty, editValue); + } + + private void FontSize_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + if (e.AddedItems.Count == 0) + return; + + ApplyPropertyValueToSelectedText(TextElement.FontSizeProperty, e.AddedItems[0]); + } + + void RichTextBox_SelectionChanged(object sender, RoutedEventArgs e) + { + UpdateVisualState(); + } + + private void DragWidget_DragDelta(object sender, DragDeltaEventArgs e) + { + ProcessMove(e); + } + + #endregion //Event Hanlders + + #region Methods + + private void UpdateVisualState() + { + UpdateToggleButtonState(); + UpdateSelectedFontFamily(); + UpdateSelectedFontSize(); + } + + private void UpdateToggleButtonState() + { + UpdateItemCheckedState(_btnBold, TextElement.FontWeightProperty, FontWeights.Bold); + UpdateItemCheckedState(_btnItalic, TextElement.FontStyleProperty, FontStyles.Italic); + UpdateItemCheckedState(_btnUnderline, Inline.TextDecorationsProperty, TextDecorations.Underline); + + UpdateItemCheckedState(_btnAlignLeft, Paragraph.TextAlignmentProperty, TextAlignment.Left); + UpdateItemCheckedState(_btnAlignCenter, Paragraph.TextAlignmentProperty, TextAlignment.Center); + UpdateItemCheckedState(_btnAlignRight, Paragraph.TextAlignmentProperty, TextAlignment.Right); + } + + void UpdateItemCheckedState(ToggleButton button, DependencyProperty formattingProperty, object expectedValue) + { + object currentValue = RichTextBox.Selection.GetPropertyValue(formattingProperty); + button.IsChecked = (currentValue == DependencyProperty.UnsetValue) ? false : currentValue != null && currentValue.Equals(expectedValue); + } + + private void UpdateSelectedFontFamily() + { + object value = RichTextBox.Selection.GetPropertyValue(TextElement.FontFamilyProperty); + FontFamily currentFontFamily = (FontFamily)((value == DependencyProperty.UnsetValue) ? null : value); + if (currentFontFamily != null) + { + _cmbFontFamilies.SelectedItem = currentFontFamily; + } + } + + private void UpdateSelectedFontSize() + { + object value = RichTextBox.Selection.GetPropertyValue(TextElement.FontSizeProperty); + _cmbFontSizes.SelectedValue = (value == DependencyProperty.UnsetValue) ? null : value; + } + + void ApplyPropertyValueToSelectedText(DependencyProperty formattingProperty, object value) + { + if (value == null) + return; + + RichTextBox.Selection.ApplyPropertyValue(formattingProperty, value); + } + + private void ProcessMove(DragDeltaEventArgs e) + { + AdornerLayer layer = AdornerLayer.GetAdornerLayer(RichTextBox); + UIElementAdorner adorner = layer.GetAdorners(RichTextBox)[0] as UIElementAdorner; + adorner.SetOffsets(adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange); + } + + #endregion //Methods + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbarManager.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbarManager.cs new file mode 100644 index 00000000..295e419a --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbarManager.cs @@ -0,0 +1,107 @@ +using System; +using System.Windows.Controls; +using System.Windows.Documents; +using System.Windows; + +namespace Microsoft.Windows.Controls.Formatting +{ + internal class FormatToolbarManager + { + RichTextBox _richTextBox; + readonly UIElementAdorner _adorner; + FormatToolbar toolbar; + + bool AdornerIsVisible + { + get { return _adorner.Visibility == Visibility.Visible; } + } + + public FormatToolbarManager(RichTextBox richTextBox) + { + _richTextBox = richTextBox; + _adorner = new UIElementAdorner(richTextBox); + toolbar = new FormatToolbar(richTextBox); + AttachToRichtextBox(); + } + + private void AttachToRichtextBox() + { + _richTextBox.Selection.Changed += Selection_Changed; + } + + void Selection_Changed(object sender, EventArgs e) + { + TextRange selectedText = new TextRange(_richTextBox.Selection.Start, _richTextBox.Selection.End); + if (selectedText.Text.Length > 0) + { + VerifyAdorner(); + } + else + { + HideAdorner(); + } + } + + //TODO: refactor + void VerifyAdorner() + { + VerifyAdornerLayer(); + + Control adorningEditor = toolbar; + _adorner.Child = adorningEditor; + _adorner.Visibility = Visibility.Visible; + + Rect wordBoundary = _richTextBox.Selection.End.GetPositionAtOffset(0, LogicalDirection.Backward).GetCharacterRect(LogicalDirection.Backward); + + double left = wordBoundary.X; + double top = (wordBoundary.Y + wordBoundary.Height) - toolbar.ActualHeight; + + //top boundary + if (top < 0) + { + top = wordBoundary.Y + wordBoundary.Height; + } + + //right boundary + if (left + toolbar.ActualWidth > _richTextBox.ActualWidth - 20) + { + left = left - toolbar.ActualWidth; + top = wordBoundary.Y + wordBoundary.Height + 5; + } + + //bottom boundary + if (top + toolbar.ActualHeight > _richTextBox.ActualHeight - 20) + { + top = wordBoundary.Y - (toolbar.ActualHeight + wordBoundary.Height); + } + + _adorner.SetOffsets(left, top); + } + + /// + /// Ensures that the adorner is in the adorner layer. + /// + /// True if the adorner is in the adorner layer, else false. + bool VerifyAdornerLayer() + { + if (_adorner.Parent != null) + return true; + + AdornerLayer layer = AdornerLayer.GetAdornerLayer(_richTextBox); + if (layer == null) + return false; + + layer.Add(_adorner); + return true; + } + + void HideAdorner() + { + if (this.AdornerIsVisible) + { + _adorner.Visibility = Visibility.Collapsed; + _adorner.Child = null; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Bold16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Bold16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/CenterAlign16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/CenterAlign16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Italic16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Italic16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/JustifyAlign16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/JustifyAlign16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/LeftAlign16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/LeftAlign16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/RightAlign16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/RightAlign16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Underline16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Underline16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons.xaml new file mode 100644 index 00000000..30d4977f --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons.xaml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml new file mode 100644 index 00000000..cb7d3894 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Images/delete8.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Images/delete8.png new file mode 100644 index 00000000..153a6c82 Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Images/delete8.png differ diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/Token.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/Token.cs new file mode 100644 index 00000000..ade47fde --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/Token.cs @@ -0,0 +1,55 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +using System; + +namespace Xceed.Wpf.Toolkit +{ + internal class Token + { + public string Delimiter + { + get; + private set; + } + public object Item + { + get; + set; + } + + private string _tokenKey; + public string TokenKey + { + get + { + return _tokenKey; + } + set + { + _tokenKey = String.Format( "{0}{1}", value, Delimiter ); + } + } + + public Token( string delimiter ) + { + Delimiter = delimiter; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenItem.cs new file mode 100644 index 00000000..d38202b5 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenItem.cs @@ -0,0 +1,45 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +using System.Windows; +using System.Windows.Controls; + +namespace Xceed.Wpf.Toolkit +{ + public class TokenItem : ContentControl + { + static TokenItem() + { + DefaultStyleKeyProperty.OverrideMetadata( typeof( TokenItem ), new FrameworkPropertyMetadata( typeof( TokenItem ) ) ); + } + + public static readonly DependencyProperty TokenKeyProperty = DependencyProperty.Register( "TokenKey", typeof( string ), typeof( TokenItem ), new UIPropertyMetadata( null ) ); + public string TokenKey + { + get + { + return ( string )GetValue( TokenKeyProperty ); + } + set + { + SetValue( TokenKeyProperty, value ); + } + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBox.cs new file mode 100644 index 00000000..9ddd586a --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBox.cs @@ -0,0 +1,394 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +//Based of the code written by Pavan Podila +//http://blog.pixelingene.com/2010/10/tokenizing-control-convert-text-to-tokens/ + +using System; +using System.Linq; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Documents; +using System.Windows.Input; + +namespace Xceed.Wpf.Toolkit +{ + public class TokenizedTextBox : ItemsControl + { + #region Members + + private System.Windows.Controls.RichTextBox _rtb = null; + private bool _surpressTextChanged = false; + private bool _surpressTextChangedEvent = false; + + #endregion //Members + + #region Properties + + public static readonly DependencyProperty SearchMemberPathProperty = DependencyProperty.Register( "SearchMemberPath", typeof( string ), typeof( TokenizedTextBox ), new UIPropertyMetadata( String.Empty ) ); + public string SearchMemberPath + { + get + { + return ( string )GetValue( SearchMemberPathProperty ); + } + set + { + SetValue( SearchMemberPathProperty, value ); + } + } + + public static readonly DependencyProperty TokenDelimiterProperty = DependencyProperty.Register( "TokenDelimiter", typeof( string ), typeof( TokenizedTextBox ), new UIPropertyMetadata( ";" ) ); + public string TokenDelimiter + { + get + { + return ( string )GetValue( TokenDelimiterProperty ); + } + set + { + SetValue( TokenDelimiterProperty, value ); + } + } + + public static readonly DependencyProperty TokenTemplateProperty = DependencyProperty.Register( "TokenTemplate", typeof( DataTemplate ), typeof( TokenizedTextBox ), new UIPropertyMetadata( null ) ); + public DataTemplate TokenTemplate + { + get + { + return ( DataTemplate )GetValue( TokenTemplateProperty ); + } + set + { + SetValue( TokenTemplateProperty, value ); + } + } + + #region Text + + public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( TokenizedTextBox ), new UIPropertyMetadata( null, OnTextChanged ) ); + public string Text + { + get + { + return ( string )GetValue( TextProperty ); + } + set + { + SetValue( TextProperty, value ); + } + } + + private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e ) + { + TokenizedTextBox tokenizedTextBox = o as TokenizedTextBox; + if( tokenizedTextBox != null ) + tokenizedTextBox.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue ); + } + + protected virtual void OnTextChanged( string oldValue, string newValue ) + { + if( _rtb == null || _surpressTextChanged ) + return; + + //TODO: when text changes update tokens + } + + #endregion //Text + + public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register( "ValueMemberPath", typeof( string ), typeof( TokenizedTextBox ), new UIPropertyMetadata( String.Empty ) ); + public string ValueMemberPath + { + get + { + return ( string )GetValue( ValueMemberPathProperty ); + } + set + { + SetValue( ValueMemberPathProperty, value ); + } + } + + + #endregion //Properties + + #region Constructors + + static TokenizedTextBox() + { + DefaultStyleKeyProperty.OverrideMetadata( typeof( TokenizedTextBox ), new FrameworkPropertyMetadata( typeof( TokenizedTextBox ) ) ); + } + + public TokenizedTextBox() + { + CommandBindings.Add( new CommandBinding( TokenizedTextBoxCommands.Delete, DeleteToken ) ); + } + + #endregion //Constructors + + #region Base Class Overrides + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + if( _rtb != null ) + { + _rtb.TextChanged -= RichTextBox_TextChanged; + _rtb.PreviewKeyDown -= RichTextBox_PreviewKeyDown; + } + _rtb = GetTemplateChild( "PART_ContentHost" ) as System.Windows.Controls.RichTextBox; + if( _rtb != null ) + { + _rtb.TextChanged += RichTextBox_TextChanged; + _rtb.PreviewKeyDown += RichTextBox_PreviewKeyDown; + } + + InitializeTokensFromText(); + } + + #endregion //Base Class Overrides + + #region Event Handlers + + private void RichTextBox_TextChanged( object sender, TextChangedEventArgs e ) + { + if( _surpressTextChangedEvent ) + return; + + var text = _rtb.CaretPosition.GetTextInRun( LogicalDirection.Backward ); + var token = ResolveToken( text ); + if( token != null ) + { + ReplaceTextWithToken( text.Trim(), token ); + } + } + + void RichTextBox_PreviewKeyDown( object sender, KeyEventArgs e ) + { + InlineUIContainer container = null; + + if( e.Key == Key.Back ) + { + container = _rtb.CaretPosition.GetAdjacentElement( LogicalDirection.Backward ) as InlineUIContainer; + } + else if( e.Key == Key.Delete ) + { + //if the selected text is a blank space, I will assume that a token item is selected. + //if a token item is selected, we need to move the caret position to the left of the element so we can grab the InlineUIContainer + if( _rtb.Selection.Text == " " ) + { + TextPointer moveTo = _rtb.CaretPosition.GetNextInsertionPosition( LogicalDirection.Backward ); + _rtb.CaretPosition = moveTo; + } + + //the cursor is to the left of a token item + container = _rtb.CaretPosition.GetAdjacentElement( LogicalDirection.Forward ) as InlineUIContainer; + } + + //if the container is not null that means we have something to delete + if( container != null ) + { + var token = ( container as InlineUIContainer ).Child as TokenItem; + if( token != null ) + { + SetTextInternal( Text.Replace( token.TokenKey, "" ) ); + } + } + } + + #endregion //Event Handlers + + #region Methods + + private void InitializeTokensFromText() + { + if( !String.IsNullOrEmpty( Text ) ) + { + string[] tokenKeys = Text.Split( new string[] { TokenDelimiter }, StringSplitOptions.RemoveEmptyEntries ); + foreach( string tokenKey in tokenKeys ) + { + var para = _rtb.CaretPosition.Paragraph; + var token = new Token( TokenDelimiter ) + { + TokenKey = tokenKey, + Item = ResolveItemByTokenKey( tokenKey ) + }; + para.Inlines.Add( CreateTokenContainer( token ) ); + } + } + } + + private Token ResolveToken( string text ) + { + if( text.EndsWith( TokenDelimiter ) ) + return ResolveTokenBySearchMemberPath( text.Substring( 0, text.Length - 1 ).Trim() ); + + return null; + } + + private Token ResolveTokenBySearchMemberPath( string searchText ) + { + //create a new token and default the settings to the search text + var token = new Token( TokenDelimiter ) + { + TokenKey = searchText, + Item = searchText + }; + + if( ItemsSource != null ) + { + foreach( object item in ItemsSource ) + { + var searchProperty = item.GetType().GetProperty( SearchMemberPath ); + if( searchProperty != null ) + { + var searchValue = searchProperty.GetValue( item, null ); + if( searchText.Equals( searchValue.ToString(), StringComparison.InvariantCultureIgnoreCase ) ) + { + var valueProperty = item.GetType().GetProperty( ValueMemberPath ); + if( valueProperty != null ) + token.TokenKey = valueProperty.GetValue( item, null ).ToString(); + + token.Item = item; + break; + } + } + } + } + + return token; + } + + private object ResolveItemByTokenKey( string tokenKey ) + { + if( ItemsSource != null ) + { + foreach( object item in ItemsSource ) + { + var property = item.GetType().GetProperty( ValueMemberPath ); + if( property != null ) + { + var value = property.GetValue( item, null ); + if( tokenKey.Equals( value.ToString(), StringComparison.InvariantCultureIgnoreCase ) ) + return item; + } + } + } + + return tokenKey; + } + + private void ReplaceTextWithToken( string inputText, Token token ) + { + _surpressTextChangedEvent = true; + + var para = _rtb.CaretPosition.Paragraph; + + var matchedRun = para.Inlines.FirstOrDefault( inline => + { + var run = inline as Run; + return ( run != null && run.Text.EndsWith( inputText ) ); + } ) as Run; + + if( matchedRun != null ) // Found a Run that matched the inputText + { + var tokenContainer = CreateTokenContainer( token ); + para.Inlines.InsertBefore( matchedRun, tokenContainer ); + + // Remove only if the Text in the Run is the same as inputText, else split up + if( matchedRun.Text == inputText ) + { + para.Inlines.Remove( matchedRun ); + } + else // Split up + { + var index = matchedRun.Text.IndexOf( inputText ) + inputText.Length; + var tailEnd = new Run( matchedRun.Text.Substring( index ) ); + para.Inlines.InsertAfter( matchedRun, tailEnd ); + para.Inlines.Remove( matchedRun ); + } + + //now append the Text with the token key + SetTextInternal( Text + token.TokenKey ); + } + + _surpressTextChangedEvent = false; + } + + private InlineUIContainer CreateTokenContainer( Token token ) + { + return new InlineUIContainer( CreateTokenItem( token ) ) + { + BaselineAlignment = BaselineAlignment.Center + }; + } + + private TokenItem CreateTokenItem( Token token ) + { + object item = token.Item; + + var tokenItem = new TokenItem() + { + TokenKey = token.TokenKey, + Content = item, + ContentTemplate = TokenTemplate + }; + + if( TokenTemplate == null ) + { + //if no template was supplied let's try to get a value from the object using the DisplayMemberPath + if( !String.IsNullOrEmpty( DisplayMemberPath ) ) + { + var property = item.GetType().GetProperty( DisplayMemberPath ); + if( property != null ) + { + var value = property.GetValue( item, null ); + if( value != null ) + tokenItem.Content = value; + } + } + } + + return tokenItem; + } + + private void DeleteToken( object sender, ExecutedRoutedEventArgs e ) + { + var para = _rtb.CaretPosition.Paragraph; + + Inline inlineToRemove = para.Inlines.Where( inline => inline is InlineUIContainer && ( ( inline as InlineUIContainer ).Child as TokenItem ).TokenKey.Equals( e.Parameter ) ).FirstOrDefault(); + + if( inlineToRemove != null ) + para.Inlines.Remove( inlineToRemove ); + + //update Text to remove delimited value + SetTextInternal( Text.Replace( e.Parameter.ToString(), "" ) ); + } + + private void SetTextInternal( string text ) + { + _surpressTextChanged = true; + Text = text; + _surpressTextChanged = false; + } + + #endregion //Methods + } +} \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBoxCommands.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBoxCommands.cs new file mode 100644 index 00000000..a6c4a5a4 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBoxCommands.cs @@ -0,0 +1,36 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +using System.Windows.Input; + +namespace Xceed.Wpf.Toolkit +{ + public static class TokenizedTextBoxCommands + { + private static RoutedCommand _deleteCommand = new RoutedCommand(); + + public static RoutedCommand Delete + { + get + { + return _deleteCommand; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml new file mode 100644 index 00000000..1270e6d1 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml @@ -0,0 +1,78 @@ + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj.vspscc b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj.vspscc new file mode 100644 index 00000000..feffdeca --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj.vspscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/sn.pfx b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/sn.pfx new file mode 100644 index 00000000..0f441ed9 Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/sn.pfx differ diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Images/Delete16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Images/Delete16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditorDialog.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditorDialog.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionEditors/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.resx rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/IValidateInput.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/InputValidationErrorEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidContentException.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/CachedTextInfo.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/ValueRangeTextBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/QueryTextFromValueEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/QueryValueFromTextEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/NotifyPropertyChangedHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/NotifyPropertyChangedHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ReflectionHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/TreeHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ValueChangeHelper.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/InsertKeyModeEnum.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskFormatEnum.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ByteUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/CommonNumericUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/LongUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/SByteUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ShortUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/SingleUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/UIntegerUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ULongUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/UShortUpDown.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/UpDownEditors.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/IPropertyParent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/IPropertyParent.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WPFToolkit.Extended.csproj similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WPFToolkit.Extended.csproj diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/sn.snk similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/sn.snk rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/sn.snk diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/BusyIndicator.cs new file mode 100644 index 00000000..6a73cd8f --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/BusyIndicator.cs @@ -0,0 +1,266 @@ +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Shapes; +using System.Windows.Threading; + +namespace Microsoft.Windows.Controls +{ + /// + /// A control to provide a visual indicator when an application is busy. + /// + [TemplateVisualState(Name = VisualStates.StateIdle, GroupName = VisualStates.GroupBusyStatus)] + [TemplateVisualState(Name = VisualStates.StateBusy, GroupName = VisualStates.GroupBusyStatus)] + [TemplateVisualState(Name = VisualStates.StateVisible, GroupName = VisualStates.GroupVisibility)] + [TemplateVisualState(Name = VisualStates.StateHidden, GroupName = VisualStates.GroupVisibility)] + [StyleTypedProperty(Property = "OverlayStyle", StyleTargetType = typeof(Rectangle))] + [StyleTypedProperty(Property = "ProgressBarStyle", StyleTargetType = typeof(ProgressBar))] + public class BusyIndicator : ContentControl + { + #region Private Members + + /// + /// Timer used to delay the initial display and avoid flickering. + /// + private DispatcherTimer _displayAfterTimer = new DispatcherTimer(); + + #endregion //Private Members + + #region Constructors + + static BusyIndicator() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(BusyIndicator), new FrameworkPropertyMetadata(typeof(BusyIndicator))); + } + + public BusyIndicator() + { + _displayAfterTimer.Tick += DisplayAfterTimerElapsed; + } + + #endregion //Constructors + + #region Base Class Overrides + + /// + /// Overrides the OnApplyTemplate method. + /// + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + ChangeVisualState(false); + } + + #endregion //Base Class Overrides + + #region Properties + + /// + /// Gets or sets a value indicating whether the BusyContent is visible. + /// + protected bool IsContentVisible { get; set; } + + #endregion //Properties + + #region Dependency Properties + + #region IsBusy + + /// + /// Identifies the IsBusy dependency property. + /// + public static readonly DependencyProperty IsBusyProperty = DependencyProperty.Register( + "IsBusy", + typeof(bool), + typeof(BusyIndicator), + new PropertyMetadata(false, new PropertyChangedCallback(OnIsBusyChanged))); + + /// + /// Gets or sets a value indicating whether the busy indicator should show. + /// + public bool IsBusy + { + get { return (bool)GetValue(IsBusyProperty); } + set { SetValue(IsBusyProperty, value); } + } + + /// + /// IsBusyProperty property changed handler. + /// + /// BusyIndicator that changed its IsBusy. + /// Event arguments. + private static void OnIsBusyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + ((BusyIndicator)d).OnIsBusyChanged(e); + } + + /// + /// IsBusyProperty property changed handler. + /// + /// Event arguments. + protected virtual void OnIsBusyChanged(DependencyPropertyChangedEventArgs e) + { + if (IsBusy) + { + if (DisplayAfter.Equals(TimeSpan.Zero)) + { + // Go visible now + IsContentVisible = true; + } + else + { + // Set a timer to go visible + _displayAfterTimer.Interval = DisplayAfter; + _displayAfterTimer.Start(); + } + } + else + { + // No longer visible + _displayAfterTimer.Stop(); + IsContentVisible = false; + } + + ChangeVisualState(true); + } + + #endregion //IsBusy + + #region Busy Content + + /// + /// Identifies the BusyContent dependency property. + /// + public static readonly DependencyProperty BusyContentProperty = DependencyProperty.Register( + "BusyContent", + typeof(object), + typeof(BusyIndicator), + new PropertyMetadata(null)); + + /// + /// Gets or sets a value indicating the busy content to display to the user. + /// + public object BusyContent + { + get { return (object)GetValue(BusyContentProperty); } + set { SetValue(BusyContentProperty, value); } + } + + #endregion //Busy Content + + #region Busy Content Template + + /// + /// Identifies the BusyTemplate dependency property. + /// + public static readonly DependencyProperty BusyContentTemplateProperty = DependencyProperty.Register( + "BusyContentTemplate", + typeof(DataTemplate), + typeof(BusyIndicator), + new PropertyMetadata(null)); + + /// + /// Gets or sets a value indicating the template to use for displaying the busy content to the user. + /// + public DataTemplate BusyContentTemplate + { + get { return (DataTemplate)GetValue(BusyContentTemplateProperty); } + set { SetValue(BusyContentTemplateProperty, value); } + } + + #endregion //Busy Content Template + + #region Display After + + /// + /// Identifies the DisplayAfter dependency property. + /// + public static readonly DependencyProperty DisplayAfterProperty = DependencyProperty.Register( + "DisplayAfter", + typeof(TimeSpan), + typeof(BusyIndicator), + new PropertyMetadata(TimeSpan.FromSeconds(0.1))); + + /// + /// Gets or sets a value indicating how long to delay before displaying the busy content. + /// + public TimeSpan DisplayAfter + { + get { return (TimeSpan)GetValue(DisplayAfterProperty); } + set { SetValue(DisplayAfterProperty, value); } + } + + #endregion //Display After + + #region Overlay Style + + /// + /// Identifies the OverlayStyle dependency property. + /// + public static readonly DependencyProperty OverlayStyleProperty = DependencyProperty.Register( + "OverlayStyle", + typeof(Style), + typeof(BusyIndicator), + new PropertyMetadata(null)); + + /// + /// Gets or sets a value indicating the style to use for the overlay. + /// + public Style OverlayStyle + { + get { return (Style)GetValue(OverlayStyleProperty); } + set { SetValue(OverlayStyleProperty, value); } + } + #endregion //Overlay Style + + #region ProgressBar Style + + /// + /// Identifies the ProgressBarStyle dependency property. + /// + public static readonly DependencyProperty ProgressBarStyleProperty = DependencyProperty.Register( + "ProgressBarStyle", + typeof(Style), + typeof(BusyIndicator), + new PropertyMetadata(null)); + + /// + /// Gets or sets a value indicating the style to use for the progress bar. + /// + public Style ProgressBarStyle + { + get { return (Style)GetValue(ProgressBarStyleProperty); } + set { SetValue(ProgressBarStyleProperty, value); } + } + + #endregion //ProgressBar Style + + #endregion //Dependency Properties + + #region Methods + + /// + /// Handler for the DisplayAfterTimer. + /// + /// Event sender. + /// Event arguments. + private void DisplayAfterTimerElapsed(object sender, EventArgs e) + { + _displayAfterTimer.Stop(); + IsContentVisible = true; + ChangeVisualState(true); + } + + /// + /// Changes the control's visual state(s). + /// + /// True if state transitions should be used. + protected virtual void ChangeVisualState(bool useTransitions) + { + VisualStateManager.GoToState(this, IsBusy ? VisualStates.StateBusy : VisualStates.StateIdle, useTransitions); + VisualStateManager.GoToState(this, IsContentVisible ? VisualStates.StateVisible : VisualStates.StateHidden, useTransitions); + } + + #endregion //Methods + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/VisualStates.BusyIndicator.cs new file mode 100644 index 00000000..5d78d952 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/VisualStates.BusyIndicator.cs @@ -0,0 +1,37 @@ +using System; + +namespace Microsoft.Windows.Controls +{ + internal static partial class VisualStates + { + /// + /// Busyness group name. + /// + public const string GroupBusyStatus = "BusyStatusStates"; + + /// + /// Busy state for BusyIndicator. + /// + public const string StateBusy = "Busy"; + + /// + /// Idle state for BusyIndicator. + /// + public const string StateIdle = "Idle"; + + /// + /// BusyDisplay group. + /// + public const string GroupVisibility = "VisibilityStates"; + + /// + /// Visible state name for BusyIndicator. + /// + public const string StateVisible = "Visible"; + + /// + /// Hidden state name for BusyIndicator. + /// + public const string StateHidden = "Hidden"; + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ButtonSpinner.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ButtonSpinner.cs new file mode 100644 index 00000000..b2c2ad99 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ButtonSpinner.cs @@ -0,0 +1,191 @@ +using System; +using System.Windows; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Controls.Primitives; + +namespace Microsoft.Windows.Controls +{ + /// + /// Represents a spinner control that includes two Buttons. + /// + [ContentProperty("Content")] + public class ButtonSpinner : Spinner + { + #region Properties + + #region Content + + /// + /// Identifies the Content dependency property. + /// + public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(ButtonSpinner), new PropertyMetadata(null, OnContentPropertyChanged)); + public object Content + { + get { return GetValue(ContentProperty) as object; } + set { SetValue(ContentProperty, value); } + } + + /// + /// ContentProperty property changed handler. + /// + /// ButtonSpinner that changed its Content. + /// Event arguments. + private static void OnContentPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + ButtonSpinner source = d as ButtonSpinner; + source.OnContentChanged(e.OldValue, e.NewValue); + } + + #endregion //Content + + private ButtonBase _increaseButton; + /// + /// Gets or sets the IncreaseButton template part. + /// + private ButtonBase IncreaseButton + { + get { return _increaseButton; } + set + { + if (_increaseButton != null) + { + _increaseButton.Click -= OnButtonClick; + } + + _increaseButton = value; + + if (_increaseButton != null) + { + _increaseButton.Click += OnButtonClick; + } + } + } + + + private ButtonBase _decreaseButton; + /// + /// Gets or sets the DecreaseButton template part. + /// + private ButtonBase DecreaseButton + { + get { return _decreaseButton; } + set + { + if (_decreaseButton != null) + { + _decreaseButton.Click -= OnButtonClick; + } + + _decreaseButton = value; + + if (_decreaseButton != null) + { + _decreaseButton.Click += OnButtonClick; + } + } + } + + #endregion //Properties + + #region Constructors + + static ButtonSpinner() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(ButtonSpinner), new FrameworkPropertyMetadata(typeof(ButtonSpinner))); + } + + #endregion //Constructors + + #region Base Class Overrides + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + IncreaseButton = GetTemplateChild("IncreaseButton") as ButtonBase; + DecreaseButton = GetTemplateChild("DecreaseButton") as ButtonBase; + + SetButtonUsage(); + } + + #endregion //Base Class Overrides + + /// + /// Occurs when the Content property value changed. + /// + /// The old value of the Content property. + /// The new value of the Content property. + protected virtual void OnContentChanged(object oldValue, object newValue) { } + + /// + /// Handle click event of IncreaseButton and DecreaseButton template parts, + /// translating Click to appropriate Spin event. + /// + /// Event sender, should be either IncreaseButton or DecreaseButton template part. + /// Event args. + private void OnButtonClick(object sender, RoutedEventArgs e) + { + SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease; + OnSpin(new SpinEventArgs(direction)); + } + + /// + /// Cancel LeftMouseButtonUp events originating from a button that has + /// been changed to disabled. + /// + /// The data for the event. + protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e) + { + base.OnMouseLeftButtonUp(e); + + Point mousePosition; + if (IncreaseButton != null && IncreaseButton.IsEnabled == false) + { + mousePosition = e.GetPosition(IncreaseButton); + if (mousePosition.X > 0 && mousePosition.X < IncreaseButton.ActualWidth && + mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.ActualHeight) + { + e.Handled = true; + } + } + + if (DecreaseButton != null && DecreaseButton.IsEnabled == false) + { + mousePosition = e.GetPosition(DecreaseButton); + if (mousePosition.X > 0 && mousePosition.X < DecreaseButton.ActualWidth && + mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.ActualHeight) + { + e.Handled = true; + } + } + } + + /// + /// Called when valid spin direction changed. + /// + /// The old value. + /// The new value. + protected override void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue) + { + SetButtonUsage(); + } + + /// + /// Disables or enables the buttons based on the valid spin direction. + /// + private void SetButtonUsage() + { + // buttonspinner adds buttons that spin, so disable accordingly. + if (IncreaseButton != null) + { + IncreaseButton.IsEnabled = ((ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase); + } + + if (DecreaseButton != null) + { + DecreaseButton.IsEnabled = ((ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease); + } + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinDirection.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinDirection.cs new file mode 100644 index 00000000..aaa121fb --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinDirection.cs @@ -0,0 +1,21 @@ +using System; + +namespace Microsoft.Windows.Controls +{ + /// + /// Represents spin directions that could be initiated by the end-user. + /// + /// Preview + public enum SpinDirection + { + /// + /// Represents a spin initiated by the end-user in order to Increase a value. + /// + Increase = 0, + + /// + /// Represents a spin initiated by the end-user in order to Decrease a value. + /// + Decrease = 1 + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinEventArgs.cs new file mode 100644 index 00000000..f8a89385 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinEventArgs.cs @@ -0,0 +1,28 @@ +using System; +using System.Windows; + +namespace Microsoft.Windows.Controls +{ + /// + /// Provides data for the Spinner.Spin event. + /// + /// Preview + public class SpinEventArgs : RoutedEventArgs + { + /// + /// Gets the SpinDirection for the spin that has been initiated by the + /// end-user. + /// + public SpinDirection Direction { get; private set; } + + /// + /// Initializes a new instance of the SpinEventArgs class. + /// + /// Spin direction. + public SpinEventArgs(SpinDirection direction) + : base() + { + Direction = direction; + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Spinner.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Spinner.cs new file mode 100644 index 00000000..20b8d1cb --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Spinner.cs @@ -0,0 +1,77 @@ +using System; +using System.Windows.Controls; +using System.Windows; + +namespace Microsoft.Windows.Controls +{ + /// + /// Base class for controls that represents controls that can spin. + /// + public abstract class Spinner : Control + { + #region Properties + + /// + /// Identifies the ValidSpinDirection dependency property. + /// + public static readonly DependencyProperty ValidSpinDirectionProperty = DependencyProperty.Register("ValidSpinDirection", typeof(ValidSpinDirections), typeof(Spinner), new PropertyMetadata(ValidSpinDirections.Increase | ValidSpinDirections.Decrease, OnValidSpinDirectionPropertyChanged)); + public ValidSpinDirections ValidSpinDirection + { + get { return (ValidSpinDirections)GetValue(ValidSpinDirectionProperty); } + set { SetValue(ValidSpinDirectionProperty, value); } + } + + /// + /// ValidSpinDirectionProperty property changed handler. + /// + /// ButtonSpinner that changed its ValidSpinDirection. + /// Event arguments. + private static void OnValidSpinDirectionPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + Spinner source = (Spinner)d; + ValidSpinDirections oldvalue = (ValidSpinDirections)e.OldValue; + ValidSpinDirections newvalue = (ValidSpinDirections)e.NewValue; + source.OnValidSpinDirectionChanged(oldvalue, newvalue); + } + + #endregion //Properties + + /// + /// Occurs when spinning is initiated by the end-user. + /// + public event EventHandler Spin; + + /// + /// Initializes a new instance of the Spinner class. + /// + protected Spinner() { } + + /// + /// Raises the OnSpin event when spinning is initiated by the end-user. + /// + /// Spin event args. + protected virtual void OnSpin(SpinEventArgs e) + { + ValidSpinDirections valid = e.Direction == SpinDirection.Increase ? ValidSpinDirections.Increase : ValidSpinDirections.Decrease; + + if ((ValidSpinDirection & valid) != valid) + { + // spin is not allowed. + throw new InvalidOperationException("Spin action is not valid at this moment."); + } + + EventHandler handler = Spin; + if (handler != null) + { + handler(this, e); + } + } + + /// + /// Called when valid spin direction changed. + /// + /// The old value. + /// The new value. + protected virtual void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue) { } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ValidSpinDirections.cs new file mode 100644 index 00000000..d744620d --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ValidSpinDirections.cs @@ -0,0 +1,26 @@ +using System; + +namespace Microsoft.Windows.Controls +{ + /// + /// Represents spin directions that are valid. + /// + [Flags] + public enum ValidSpinDirections + { + /// + /// Can not increase nor decrease. + /// + None = 0, + + /// + /// Can increase. + /// + Increase = 1, + + /// + /// Can decrease. + /// + Decrease = 2 + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/ChildWindow.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/ChildWindow.cs new file mode 100644 index 00000000..8a44695d --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/ChildWindow.cs @@ -0,0 +1,482 @@ +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Controls.Primitives; +using System.ComponentModel; + +namespace Microsoft.Windows.Controls +{ + [TemplateVisualState(GroupName = VisualStates.WindowStatesGroup, Name = VisualStates.Open)] + [TemplateVisualState(GroupName = VisualStates.WindowStatesGroup, Name = VisualStates.Closed)] + public class ChildWindow : ContentControl + { + #region Private Members + + private TranslateTransform _moveTransform = new TranslateTransform(); + private bool _startupPositionInitialized; + private bool _isMouseCaptured; + private Point _clickPoint; + private Point _oldPosition; + private Border _dragWidget; + private FrameworkElement _parent; + + #endregion //Private Members + + #region Constructors + + static ChildWindow() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(ChildWindow), new FrameworkPropertyMetadata(typeof(ChildWindow))); + } + + public ChildWindow() + { + LayoutUpdated += (o, e) => + { + //we only want to set the start position if this is the first time the control has bee initialized + if (!_startupPositionInitialized) + { + SetStartupPosition(); + _startupPositionInitialized = true; + } + }; + } + + #endregion //Constructors + + #region Base Class Overrides + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + _dragWidget = (Border)GetTemplateChild("PART_DragWidget"); + if (_dragWidget != null) + { + _dragWidget.AddHandler(UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler(HeaderLeftMouseButtonDown), true); + _dragWidget.AddHandler(UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler(HeaderMouseLeftButtonUp), true); + _dragWidget.MouseMove += (o, e) => HeaderMouseMove(e); + } + + CloseButton = (Button)GetTemplateChild("PART_CloseButton"); + if (CloseButton != null) + CloseButton.Click += (o, e) => Close(); + + Overlay = GetTemplateChild("PART_Overlay") as Panel; + WindowRoot = GetTemplateChild("PART_WindowRoot") as Grid; + + WindowRoot.RenderTransform = _moveTransform; + + //TODO: move somewhere else + _parent = VisualTreeHelper.GetParent(this) as FrameworkElement; + _parent.SizeChanged += (o, ea) => + { + Overlay.Height = ea.NewSize.Height; + Overlay.Width = ea.NewSize.Width; + }; + + ChangeVisualState(); + } + + #endregion //Base Class Overrides + + #region Properties + + #region Internal Properties + + internal Panel Overlay { get; private set; } + internal Grid WindowRoot { get; private set; } + internal Thumb DragWidget { get; private set; } + internal Button MinimizeButton { get; private set; } + internal Button MaximizeButton { get; private set; } + internal Button CloseButton { get; private set; } + + #endregion //Internal Properties + + #region Dependency Properties + + public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register("Caption", typeof(string), typeof(ChildWindow), new UIPropertyMetadata(String.Empty)); + public string Caption + { + get { return (string)GetValue(CaptionProperty); } + set { SetValue(CaptionProperty, value); } + } + + public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register("CaptionForeground", typeof(Brush), typeof(ChildWindow), new UIPropertyMetadata(null)); + public Brush CaptionForeground + { + get { return (Brush)GetValue(CaptionForegroundProperty); } + set { SetValue(CaptionForegroundProperty, value); } + } + + public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register("CloseButtonStyle", typeof(Style), typeof(ChildWindow), new PropertyMetadata(null)); + public Style CloseButtonStyle + { + get { return (Style)GetValue(CloseButtonStyleProperty); } + set { SetValue(CloseButtonStyleProperty, value); } + } + + public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register("CloseButtonVisibility", typeof(Visibility), typeof(ChildWindow), new PropertyMetadata(Visibility.Visible)); + public Visibility CloseButtonVisibility + { + get { return (Visibility)GetValue(CloseButtonVisibilityProperty); } + set { SetValue(CloseButtonVisibilityProperty, value); } + } + + public static readonly DependencyProperty IconSourceProperty = DependencyProperty.Register("Icon", typeof(ImageSource), typeof(ChildWindow), new UIPropertyMetadata(default(ImageSource))); + public ImageSource Icon + { + get { return (ImageSource)GetValue(IconSourceProperty); } + set { SetValue(IconSourceProperty, value); } + } + + public static readonly DependencyProperty IsModalProperty = DependencyProperty.Register("IsModal", typeof(bool), typeof(ChildWindow), new UIPropertyMetadata(true)); + public bool IsModal + { + get { return (bool)GetValue(IsModalProperty); } + set { SetValue(IsModalProperty, value); } + } + + #region Left + + public static readonly DependencyProperty LeftProperty = DependencyProperty.Register("Left", typeof(double), typeof(ChildWindow), new PropertyMetadata(0.0, new PropertyChangedCallback(OnLeftPropertyChanged))); + public double Left + { + get { return (double)GetValue(LeftProperty); } + set { SetValue(LeftProperty, value); } + } + + private static void OnLeftPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e) + { + ChildWindow window = (ChildWindow)obj; + window.Left = window.GetRestrictedLeft(); + window.ProcessMove((double)e.NewValue - (double)e.OldValue, 0); + } + + #endregion //Left + + #region OverlayBrush + + public static readonly DependencyProperty OverlayBrushProperty = DependencyProperty.Register("OverlayBrush", typeof(Brush), typeof(ChildWindow)); + public Brush OverlayBrush + { + get { return (Brush)GetValue(OverlayBrushProperty); } + set { SetValue(OverlayBrushProperty, value); } + } + + #endregion //OverlayBrush + + #region OverlayOpacity + + public static readonly DependencyProperty OverlayOpacityProperty = DependencyProperty.Register("OverlayOpacity", typeof(double), typeof(ChildWindow)); + public double OverlayOpacity + { + get { return (double)GetValue(OverlayOpacityProperty); } + set { SetValue(OverlayOpacityProperty, value); } + } + + #endregion //OverlayOpacity + + #region Top + + public static readonly DependencyProperty TopProperty = DependencyProperty.Register("Top", typeof(double), typeof(ChildWindow), new PropertyMetadata(0.0, new PropertyChangedCallback(OnTopPropertyChanged))); + public double Top + { + get { return (double)GetValue(TopProperty); } + set { SetValue(TopProperty, value); } + } + + private static void OnTopPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e) + { + ChildWindow window = (ChildWindow)obj; + window.Top = window.GetRestrictedTop(); + window.ProcessMove(0, (double)e.NewValue - (double)e.OldValue); + } + + #endregion //TopProperty + + public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register("WindowBackground", typeof(Brush), typeof(ChildWindow), new PropertyMetadata(null)); + public Brush WindowBackground + { + get { return (Brush)GetValue(WindowBackgroundProperty); } + set { SetValue(WindowBackgroundProperty, value); } + } + + public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register("WindowBorderBrush", typeof(Brush), typeof(ChildWindow), new PropertyMetadata(null)); + public Brush WindowBorderBrush + { + get { return (Brush)GetValue(WindowBorderBrushProperty); } + set { SetValue(WindowBorderBrushProperty, value); } + } + + public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register("WindowOpacity", typeof(double), typeof(ChildWindow), new PropertyMetadata(null)); + public double WindowOpacity + { + get { return (double)GetValue(WindowOpacityProperty); } + set { SetValue(WindowOpacityProperty, value); } + } + + #region WindowState + + public static readonly DependencyProperty WindowStateProperty = DependencyProperty.Register("WindowState", typeof(WindowState), typeof(ChildWindow), new PropertyMetadata(WindowState.Open, new PropertyChangedCallback(OnWindowStatePropertyChanged))); + public WindowState WindowState + { + get { return (WindowState)GetValue(WindowStateProperty); } + set { SetValue(WindowStateProperty, value); } + } + + private static void OnWindowStatePropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e) + { + ChildWindow window = (ChildWindow)obj; + window.SetWindowState((WindowState)e.NewValue); + } + + #endregion //WindowState + + #endregion //Dependency Properties + + private bool? _dialogResult; + /// + /// Gets or sets a value indicating whether the ChildWindow was accepted or canceled. + /// + /// + /// True if the child window was accepted; false if the child window was + /// canceled. The default is null. + /// + [TypeConverter(typeof(NullableBoolConverter))] + public bool? DialogResult + { + get { return _dialogResult; } + set + { + if (_dialogResult != value) + { + _dialogResult = value; + Close(); + } + } + } + + #endregion //Properties + + #region Event Handlers + + void HeaderLeftMouseButtonDown(object sender, MouseButtonEventArgs e) + { + e.Handled = true; + Focus(); + _dragWidget.CaptureMouse(); + _isMouseCaptured = true; + _clickPoint = e.GetPosition(null); //save off the mouse position + _oldPosition = new Point(Left, Top); //save off our original window position + } + + private void HeaderMouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + e.Handled = true; + _dragWidget.ReleaseMouseCapture(); + _isMouseCaptured = false; + } + + private void HeaderMouseMove(MouseEventArgs e) + { + if (_isMouseCaptured && Visibility == Visibility.Visible) + { + Point currentPosition = e.GetPosition(null); //our current mouse position + + Left = _oldPosition.X + (currentPosition.X - _clickPoint.X); + Top = _oldPosition.Y + (currentPosition.Y - _clickPoint.Y); + + //this helps keep our mouse position in sync with the drag widget position + Point dragWidgetPosition = e.GetPosition(_dragWidget); + if (dragWidgetPosition.X < 0 || dragWidgetPosition.X > _dragWidget.ActualWidth || dragWidgetPosition.Y < 0 || dragWidgetPosition.Y > _dragWidget.ActualHeight) + { + return; + } + + _oldPosition = new Point(Left, Top); + _clickPoint = e.GetPosition(Window.GetWindow(this)); //store the point where we are relative to the window + } + } + + #endregion //Event Handlers + + #region Methods + + #region Private + + private double GetRestrictedLeft() + { + if (_parent != null) + { + if (Left < 0) + { + return 0; + } + + if (Left + WindowRoot.ActualWidth > _parent.ActualWidth) + { + return _parent.ActualWidth - WindowRoot.ActualWidth; + } + } + + return Left; + } + + private double GetRestrictedTop() + { + if (_parent != null) + { + if (Top < 0) + { + return 0; + } + + if (Top + WindowRoot.ActualHeight > _parent.ActualHeight) + { + return _parent.ActualHeight - WindowRoot.ActualHeight; + } + } + + return Top; + } + + private void SetWindowState(WindowState state) + { + switch (state) + { + case WindowState.Closed: + { + ExecuteClose(); + break; + } + case WindowState.Open: + { + ExecuteOpen(); + break; + } + } + + ChangeVisualState(); + } + + private void ExecuteClose() + { + CancelEventArgs e = new CancelEventArgs(); + OnClosing(e); + + if (!e.Cancel) + { + if (!_dialogResult.HasValue) + _dialogResult = false; + + OnClosed(EventArgs.Empty); + } + else + { + _dialogResult = null; //if the Close is cancelled, DialogResult should always be NULL: + } + } + + private void ExecuteOpen() + { + _dialogResult = null; //reset the dialogResult to null each time the window is opened + SetZIndex(); + } + + private void SetZIndex() + { + if (_parent != null) + { + int parentIndex = (int)_parent.GetValue(Canvas.ZIndexProperty); + this.SetValue(Canvas.ZIndexProperty, ++parentIndex); + } + else + { + this.SetValue(Canvas.ZIndexProperty, 1); + } + } + + private void SetStartupPosition() + { + CenterChildWindow(); + } + + private void CenterChildWindow() + { + _moveTransform.X = _moveTransform.Y = 0; + + if (_parent != null) + { + Left = (_parent.ActualWidth - WindowRoot.ActualWidth) / 2.0; + Top = (_parent.ActualHeight - WindowRoot.ActualHeight) / 2.0; + } + } + + protected virtual void ChangeVisualState() + { + if (WindowState == WindowState.Closed) + { + VisualStateManager.GoToState(this, VisualStates.Closed, true); + } + else + { + VisualStateManager.GoToState(this, VisualStates.Open, true); + } + } + + #endregion //Private + + #region Protected + + protected void ProcessMove(double x, double y) + { + _moveTransform.X += x; + _moveTransform.Y += y; + } + + #endregion //Protected + + #region Public + + public void Show() + { + WindowState = WindowState.Open; + } + + public void Close() + { + WindowState = WindowState.Closed; + } + + #endregion //Public + + #endregion //Methods + + #region Events + + /// + /// Occurs when the ChildWindow is closed. + /// + public event EventHandler Closed; + protected virtual void OnClosed(EventArgs e) + { + if (Closed != null) + Closed(this, e); + } + + /// + /// Occurs when the ChildWindow is closing. + /// + public event EventHandler Closing; + protected virtual void OnClosing(CancelEventArgs e) + { + if (Closing != null) + Closing(this, e); + } + + #endregion //Events + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/VisualStates.ChildWindow.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/VisualStates.ChildWindow.cs new file mode 100644 index 00000000..eb3a4ea9 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/VisualStates.ChildWindow.cs @@ -0,0 +1,22 @@ +using System; + +namespace Microsoft.Windows.Controls +{ + internal static partial class VisualStates + { + /// + /// Window State group name. + /// + public const string WindowStatesGroup = "WindowStatesGroup"; + + /// + /// Open state name for ChildWindow. + /// + public const string Open = "Open"; + + /// + /// Closed state name for ChildWindow. + /// + public const string Closed = "Closed"; + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/WindowState.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/WindowState.cs new file mode 100644 index 00000000..cc001a25 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/WindowState.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Microsoft.Windows.Controls +{ + public enum WindowState + { + Closed, + Open + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.cs new file mode 100644 index 00000000..0d767f6f --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.cs @@ -0,0 +1,395 @@ +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Controls.Primitives; + +namespace Microsoft.Windows.Controls +{ + public class ColorPicker : Control + { + #region Private Members + + ToggleButton _colorPickerToggleButton; + Popup _colorPickerCanvasPopup; + Button _okButton; + private TranslateTransform _colorShadeSelectorTransform = new TranslateTransform(); + private Canvas _colorShadingCanvas; + private Canvas _colorShadeSelector; + private ColorSpectrumSlider _spectrumSlider; + private Point? _currentColorPosition; + private Color _currentColor = Colors.White; + + #endregion //Private Members + + #region Constructors + + static ColorPicker() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(ColorPicker), new FrameworkPropertyMetadata(typeof(ColorPicker))); + } + + public ColorPicker() + { + + } + + #endregion //Constructors + + #region Properties + + public static readonly DependencyProperty CurrentColorProperty = DependencyProperty.Register("CurrentColor", typeof(Color), typeof(ColorPicker), new PropertyMetadata(Colors.White)); + public Color CurrentColor + { + get { return (Color)GetValue(CurrentColorProperty); } + set { SetValue(CurrentColorProperty, value); } + } + + #region SelectedColor + + public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorPicker), new FrameworkPropertyMetadata(Colors.White, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback(SelectedColorPropertyChanged))); + public Color SelectedColor + { + get { return (Color)GetValue(SelectedColorProperty); } + set { SetValue(SelectedColorProperty, value); } + } + + private static void SelectedColorPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + ColorPicker colorPicker = (ColorPicker)d; + colorPicker.SetSelectedColor((Color)e.NewValue); + } + + #endregion //SelectedColor + + #region ScRGB + + #region ScA + + public static readonly DependencyProperty ScAProperty = DependencyProperty.Register("ScA", typeof(float), typeof(ColorPicker), new PropertyMetadata((float)1, new PropertyChangedCallback(OnScAPropertyChangedChanged))); + public float ScA + { + get { return (float)GetValue(ScAProperty); } + set { SetValue(ScAProperty, value); } + } + + private static void OnScAPropertyChangedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + ColorPicker c = (ColorPicker)d; + c.SetScA((float)e.NewValue); + } + + protected virtual void SetScA(float newValue) + { + _currentColor.ScA = newValue; + A = _currentColor.A; + CurrentColor = _currentColor; + HexadecimalString = _currentColor.ToString(); + } + + #endregion //ScA + + #region ScR + + public static readonly DependencyProperty ScRProperty = DependencyProperty.Register("ScR", typeof(float), typeof(ColorPicker), new PropertyMetadata((float)1, new PropertyChangedCallback(OnScRPropertyChanged))); + public float ScR + { + get { return (float)GetValue(ScRProperty); } + set { SetValue(RProperty, value); } + } + + private static void OnScRPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + + } + + #endregion //ScR + + #region ScG + + public static readonly DependencyProperty ScGProperty = DependencyProperty.Register("ScG", typeof(float), typeof(ColorPicker), new PropertyMetadata((float)1, new PropertyChangedCallback(OnScGPropertyChanged))); + public float ScG + { + get { return (float)GetValue(ScGProperty); } + set { SetValue(GProperty, value); } + } + + private static void OnScGPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + + } + + #endregion //ScG + + #region ScB + + public static readonly DependencyProperty ScBProperty = DependencyProperty.Register("ScB", typeof(float), typeof(ColorPicker), new PropertyMetadata((float)1, new PropertyChangedCallback(OnScBPropertyChanged))); + public float ScB + { + get { return (float)GetValue(BProperty); } + set { SetValue(BProperty, value); } + } + + private static void OnScBPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + + } + + #endregion //ScB + + #endregion //ScRGB + + #region RGB + + #region A + + public static readonly DependencyProperty AProperty = DependencyProperty.Register("A", typeof(byte), typeof(ColorPicker), new PropertyMetadata((byte)255, new PropertyChangedCallback(OnAPropertyChanged))); + public byte A + { + get { return (byte)GetValue(AProperty); } + set { SetValue(AProperty, value); } + } + + private static void OnAPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + ColorPicker c = (ColorPicker)d; + c.SetA((byte)e.NewValue); + } + + protected virtual void SetA(byte newValue) + { + _currentColor.A = newValue; + SetValue(CurrentColorProperty, _currentColor); + } + + #endregion //A + + #region R + + public static readonly DependencyProperty RProperty = DependencyProperty.Register("R", typeof(byte), typeof(ColorPicker), new PropertyMetadata((byte)255, new PropertyChangedCallback(OnRPropertyChanged))); + public byte R + { + get { return (byte)GetValue(RProperty); } + set { SetValue(RProperty, value); } + } + + private static void OnRPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + + } + + #endregion //R + + #region G + + public static readonly DependencyProperty GProperty = DependencyProperty.Register("G", typeof(byte), typeof(ColorPicker), new PropertyMetadata((byte)255, new PropertyChangedCallback(OnGPropertyChanged))); + public byte G + { + get { return (byte)GetValue(GProperty); } + set { SetValue(GProperty, value); } + } + + private static void OnGPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + + } + + #endregion //G + + #region B + + public static readonly DependencyProperty BProperty = DependencyProperty.Register("B", typeof(byte), typeof(ColorPicker), new PropertyMetadata((byte)255, new PropertyChangedCallback(OnBPropertyChanged))); + public byte B + { + get { return (byte)GetValue(BProperty); } + set { SetValue(BProperty, value); } + } + + private static void OnBPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + + } + + #endregion //B + + #endregion //RGB + + #region HexadecimalString + + public static readonly DependencyProperty HexadecimalStringProperty = DependencyProperty.Register("HexadecimalString", typeof(string), typeof(ColorPicker), new PropertyMetadata("#FFFFFFFF", new PropertyChangedCallback(OnHexadecimalStringPropertyChanged))); + public string HexadecimalString + { + get { return (string)GetValue(HexadecimalStringProperty); } + set { SetValue(HexadecimalStringProperty, value); } + } + + private static void OnHexadecimalStringPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + + } + + #endregion //HexadecimalString + + #endregion //Properties + + #region Base Class Overrides + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + _colorPickerToggleButton = (ToggleButton)GetTemplateChild("PART_ColorPickerToggleButton"); + _colorPickerToggleButton.Click += ColorPickerToggleButton_Clicked; + + _colorPickerCanvasPopup = (Popup)GetTemplateChild("PART_ColorPickerCanvasPopup"); + + _colorShadingCanvas = (Canvas)GetTemplateChild("PART_ColorShadingCanvas"); + _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown; + _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove; + _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged; + + _colorShadeSelector = (Canvas)GetTemplateChild("PART_ColorShadeSelector"); + _colorShadeSelector.RenderTransform = _colorShadeSelectorTransform; + + _spectrumSlider = (ColorSpectrumSlider)GetTemplateChild("PART_SpectrumSlider"); + _spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged; + + _okButton = (Button)GetTemplateChild("PART_OkButton"); + _okButton.Click += OkButton_Click; + + SetSelectedColor(SelectedColor); + } + + #endregion //Base Class Overrides + + #region Event Handlers + + void ColorShadingCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + Point p = e.GetPosition(_colorShadingCanvas); + UpdateColorShadeSelectorPositionAndCalculateColor(p, true); + } + + void ColorShadingCanvas_MouseMove(object sender, MouseEventArgs e) + { + if (e.LeftButton == MouseButtonState.Pressed) + { + Point p = e.GetPosition(_colorShadingCanvas); + UpdateColorShadeSelectorPositionAndCalculateColor(p, true); + Mouse.Synchronize(); + } + } + + void ColorShadingCanvas_SizeChanged(object sender, SizeChangedEventArgs e) + { + if (_currentColorPosition != null) + { + Point _newPoint = new Point + { + X = ((Point)_currentColorPosition).X * e.NewSize.Width, + Y = ((Point)_currentColorPosition).Y * e.NewSize.Height + }; + + UpdateColorShadeSelectorPositionAndCalculateColor(_newPoint, false); + } + } + + void SpectrumSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) + { + if (_currentColorPosition != null) + { + CalculateColor((Point)_currentColorPosition); + } + } + + void OkButton_Click(object sender, RoutedEventArgs e) + { + if (_colorPickerCanvasPopup.IsOpen || _colorPickerToggleButton.IsChecked == true) + { + CloseColorPicker(); + SelectedColor = CurrentColor; + } + } + + void ColorPickerToggleButton_Clicked(object sender, RoutedEventArgs e) + { + _colorPickerCanvasPopup.IsOpen = _colorPickerToggleButton.IsChecked ?? false; + } + + #endregion //Event Handlers + + #region Methods + + private void CloseColorPicker() + { + _colorPickerToggleButton.IsChecked = false; + _colorPickerCanvasPopup.IsOpen = false; + } + + private void SetSelectedColor(Color theColor) + { + _currentColor = theColor; + SetValue(AProperty, _currentColor.A); + SetValue(RProperty, _currentColor.R); + SetValue(GProperty, _currentColor.G); + SetValue(BProperty, _currentColor.B); + UpdateColorShadeSelectorPosition(theColor); + } + + private void UpdateColorShadeSelectorPositionAndCalculateColor(Point p, bool calculateColor) + { + if (p.Y < 0) + p.Y = 0; + + if (p.X < 0) + p.X = 0; + + if (p.X > _colorShadingCanvas.ActualWidth) + p.X = _colorShadingCanvas.ActualWidth; + + if (p.Y > _colorShadingCanvas.ActualHeight) + p.Y = _colorShadingCanvas.ActualHeight; + + _colorShadeSelectorTransform.X = p.X - (_colorShadeSelector.Width / 2); + _colorShadeSelectorTransform.Y = p.Y - (_colorShadeSelector.Height / 2); + + p.X = p.X / _colorShadingCanvas.ActualWidth; + p.Y = p.Y / _colorShadingCanvas.ActualHeight; + + _currentColorPosition = p; + + if (calculateColor) + CalculateColor(p); + } + + private void UpdateColorShadeSelectorPosition(Color color) + { + if (_spectrumSlider == null || _colorShadingCanvas == null) + return; + + _currentColorPosition = null; + + HsvColor hsv = ColorUtilities.ConvertRgbToHsv(color.R, color.G, color.B); + _spectrumSlider.Value = hsv.H; + + Point p = new Point(hsv.S, 1 - hsv.V); + + _currentColorPosition = p; + + _colorShadeSelectorTransform.X = (p.X * _colorShadingCanvas.Width) - 5; + _colorShadeSelectorTransform.Y = (p.Y * _colorShadingCanvas.Height) - 5; + } + + private void CalculateColor(Point p) + { + HsvColor hsv = new HsvColor(360 - _spectrumSlider.Value, 1, 1) { S = p.X, V = 1 - p.Y }; + _currentColor = ColorUtilities.ConvertHsvToRgb(hsv.H, hsv.S, hsv.V); ; + _currentColor.ScA = ScA; + CurrentColor = _currentColor; + HexadecimalString = _currentColor.ToString(); + } + + #endregion //Methods + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorSpectrumSlider.cs new file mode 100644 index 00000000..c4eac2d8 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorSpectrumSlider.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; +using System.Windows.Shapes; + +namespace Microsoft.Windows.Controls +{ + internal class ColorSpectrumSlider : Slider + { + #region Private Members + + private Rectangle _spectrumDisplay; + private LinearGradientBrush _pickerBrush; + + #endregion //Private Members + + #region Constructors + + static ColorSpectrumSlider() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(ColorSpectrumSlider), new FrameworkPropertyMetadata(typeof(ColorSpectrumSlider))); + } + + #endregion //Constructors + + #region Dependency Properties + + public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorSpectrumSlider), new PropertyMetadata(System.Windows.Media.Colors.Transparent)); + public Color SelectedColor + { + get { return (Color)GetValue(SelectedColorProperty); } + set { SetValue(SelectedColorProperty, value); } + } + + #endregion //Dependency Properties + + #region Base Class Overrides + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + _spectrumDisplay = (Rectangle)GetTemplateChild("PART_SpectrumDisplay"); + CreateSpectrum(); + OnValueChanged(Double.NaN, Value); + } + + protected override void OnValueChanged(double oldValue, double newValue) + { + base.OnValueChanged(oldValue, newValue); + + Color color = ColorUtilities.ConvertHsvToRgb(360 - newValue, 1, 1); + SelectedColor = color; + } + + #endregion //Base Class Overrides + + #region Methods + + private void CreateSpectrum() + { + _pickerBrush = new LinearGradientBrush(); + _pickerBrush.StartPoint = new Point(0.5, 0); + _pickerBrush.EndPoint = new Point(0.5, 1); + _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation; + + List colorsList = ColorUtilities.GenerateHsvSpectrum(); + + double stopIncrement = (double)1 / colorsList.Count; + + int i; + for (i = 0; i < colorsList.Count; i++) + { + _pickerBrush.GradientStops.Add(new GradientStop(colorsList[i], i * stopIncrement)); + } + + _pickerBrush.GradientStops[i - 1].Offset = 1.0; + _spectrumDisplay.Fill = _pickerBrush; + } + + #endregion //Methods + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorUtilities.cs new file mode 100644 index 00000000..e621c22b --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorUtilities.cs @@ -0,0 +1,156 @@ +using System; +using System.Collections.Generic; +using System.Windows.Media; + +namespace Microsoft.Windows.Controls +{ + internal static class ColorUtilities + { + /// + /// Converts an RGB color to an HSV color. + /// + /// + /// + /// + /// + public static HsvColor ConvertRgbToHsv(int r, int b, int g) + { + double delta, min; + double h = 0, s, v; + + min = Math.Min(Math.Min(r, g), b); + v = Math.Max(Math.Max(r, g), b); + delta = v - min; + + if (v == 0.0) + { + s = 0; + } + else + s = delta / v; + + if (s == 0) + h = 0.0; + + else + { + if (r == v) + h = (g - b) / delta; + else if (g == v) + h = 2 + (b - r) / delta; + else if (b == v) + h = 4 + (r - g) / delta; + + h *= 60; + if (h < 0.0) + h = h + 360; + + } + + return new HsvColor { H = h, S = s, V = v / 255 }; + } + + /// + /// Converts an HSV color to an RGB color. + /// + /// + /// + /// + /// + public static Color ConvertHsvToRgb(double h, double s, double v) + { + double r = 0, g = 0, b = 0; + + if (s == 0) + { + r = v; + g = v; + b = v; + } + else + { + int i; + double f, p, q, t; + + if (h == 360) + h = 0; + else + h = h / 60; + + i = (int)Math.Truncate(h); + f = h - i; + + p = v * (1.0 - s); + q = v * (1.0 - (s * f)); + t = v * (1.0 - (s * (1.0 - f))); + + switch (i) + { + case 0: + { + r = v; + g = t; + b = p; + break; + } + case 1: + { + r = q; + g = v; + b = p; + break; + } + case 2: + { + r = p; + g = v; + b = t; + break; + } + case 3: + { + r = p; + g = q; + b = v; + break; + } + case 4: + { + r = t; + g = p; + b = v; + break; + } + default: + { + r = v; + g = p; + b = q; + break; + } + } + + } + + return Color.FromArgb(255, (byte)(r * 255), (byte)(g * 255), (byte)(b * 255)); + } + + /// + /// Generates a list of colors with hues ranging from 0 360 and a saturation and value of 1. + /// + /// + public static List GenerateHsvSpectrum() + { + List colorsList = new List(8); + + for (int i = 0; i < 29; i++) + { + colorsList.Add(ColorUtilities.ConvertHsvToRgb(i * 12, 1, 1)); + } + + colorsList.Add(ColorUtilities.ConvertHsvToRgb(0, 1, 1)); + + return colorsList; + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/HsvColor.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/HsvColor.cs new file mode 100644 index 00000000..eed5c3bd --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/HsvColor.cs @@ -0,0 +1,18 @@ +using System; + +namespace Microsoft.Windows.Controls +{ + internal struct HsvColor + { + public double H; + public double S; + public double V; + + public HsvColor(double h, double s, double v) + { + H = h; + S = s; + V = v; + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml new file mode 100644 index 00000000..8c8430d9 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/MessageBox.cs new file mode 100644 index 00000000..317dd405 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/MessageBox.cs @@ -0,0 +1,419 @@ +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; +using System.Windows.Controls.Primitives; + +namespace Microsoft.Windows.Controls +{ + [TemplateVisualState(Name = VisualStates.OK, GroupName = VisualStates.MessageBoxButtonsGroup)] + [TemplateVisualState(Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup)] + [TemplateVisualState(Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup)] + [TemplateVisualState(Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup)] + public class MessageBox : Control + { + #region Private Members + + /// + /// Tracks the MessageBoxButon value passed into the InitializeContainer method + /// + private MessageBoxButton _button = MessageBoxButton.OK; + + #endregion //Private Members + + #region Constructors + + static MessageBox() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(MessageBox), new FrameworkPropertyMetadata(typeof(MessageBox))); + } + + internal MessageBox() + { /*user cannot create instance */ } + + #endregion //Constructors + + #region Properties + + #region Protected Properties + + /// + /// A System.Windows.MessageBoxResult value that specifies which message box button was clicked by the user. + /// + protected MessageBoxResult MessageBoxResult = MessageBoxResult.None; + + protected Window Container { get; private set; } + protected Thumb DragWidget { get; private set; } + protected Button CloseButton { get; private set; } + + protected Button OkButton { get; private set; } + protected Button CancelButton { get; private set; } + protected Button YesButton { get; private set; } + protected Button NoButton { get; private set; } + + protected Button OkButton1 { get; private set; } + protected Button CancelButton1 { get; private set; } + protected Button YesButton1 { get; private set; } + protected Button NoButton1 { get; private set; } + + #endregion //Protected Properties + + #region Dependency Properties + + public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register("Caption", typeof(string), typeof(MessageBox), new UIPropertyMetadata(String.Empty)); + public string Caption + { + get { return (string)GetValue(CaptionProperty); } + set { SetValue(CaptionProperty, value); } + } + + public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register("CaptionForeground", typeof(Brush), typeof(MessageBox), new UIPropertyMetadata(null)); + public Brush CaptionForeground + { + get { return (Brush)GetValue(CaptionForegroundProperty); } + set { SetValue(CaptionForegroundProperty, value); } + } + + public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register("CloseButtonStyle", typeof(Style), typeof(MessageBox), new PropertyMetadata(null)); + public Style CloseButtonStyle + { + get { return (Style)GetValue(CloseButtonStyleProperty); } + set { SetValue(CloseButtonStyleProperty, value); } + } + + public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register("ImageSource", typeof(ImageSource), typeof(MessageBox), new UIPropertyMetadata(default(ImageSource))); + public ImageSource ImageSource + { + get { return (ImageSource)GetValue(ImageSourceProperty); } + set { SetValue(ImageSourceProperty, value); } + } + + public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(MessageBox), new UIPropertyMetadata(String.Empty)); + public string Text + { + get { return (string)GetValue(TextProperty); } + set { SetValue(TextProperty, value); } + } + + public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register("WindowBackground", typeof(Brush), typeof(MessageBox), new PropertyMetadata(null)); + public Brush WindowBackground + { + get { return (Brush)GetValue(WindowBackgroundProperty); } + set { SetValue(WindowBackgroundProperty, value); } + } + + public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register("WindowBorderBrush", typeof(Brush), typeof(MessageBox), new PropertyMetadata(null)); + public Brush WindowBorderBrush + { + get { return (Brush)GetValue(WindowBorderBrushProperty); } + set { SetValue(WindowBorderBrushProperty, value); } + } + + public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register("WindowOpacity", typeof(double), typeof(MessageBox), new PropertyMetadata(null)); + public double WindowOpacity + { + get { return (double)GetValue(WindowOpacityProperty); } + set { SetValue(WindowOpacityProperty, value); } + } + + #endregion //Dependency Properties + + #endregion //Properties + + #region Base Class Overrides + + /// + /// Overrides the OnApplyTemplate method. + /// + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + DragWidget = (Thumb)GetTemplateChild("PART_DragWidget"); + if (DragWidget != null) + DragWidget.DragDelta += (o, e) => ProcessMove(e); + + CloseButton = (Button)GetTemplateChild("PART_CloseButton"); + if (CloseButton != null) + CloseButton.Click += (o, e) => Close(); + + NoButton = (Button)GetTemplateChild("PART_NoButton"); + if (NoButton != null) + NoButton.Click += (o, e) => Button_Click(o, e); + + NoButton1 = (Button)GetTemplateChild("PART_NoButton1"); + if (NoButton1 != null) + NoButton1.Click += (o, e) => Button_Click(o, e); + + YesButton = (Button)GetTemplateChild("PART_YesButton"); + if (YesButton != null) + YesButton.Click += (o, e) => Button_Click(o, e); + + YesButton1 = (Button)GetTemplateChild("PART_YesButton1"); + if (YesButton1 != null) + YesButton1.Click += (o, e) => Button_Click(o, e); + + CancelButton = (Button)GetTemplateChild("PART_CancelButton"); + if (CancelButton != null) + CancelButton.Click += (o, e) => Button_Click(o, e); + + CancelButton1 = (Button)GetTemplateChild("PART_CancelButton1"); + if (CancelButton1 != null) + CancelButton1.Click += (o, e) => Button_Click(o, e); + + OkButton = (Button)GetTemplateChild("PART_OkButton"); + if (OkButton != null) + OkButton.Click += (o, e) => Button_Click(o, e); + + OkButton1 = (Button)GetTemplateChild("PART_OkButton1"); + if (OkButton1 != null) + OkButton1.Click += (o, e) => Button_Click(o, e); + + ChangeVisualState(_button.ToString(), true); + } + + #endregion //Base Class Overrides + + #region Methods + + #region Public Static + + /// + /// Displays a message box that has a message and that returns a result. + /// + /// A System.String that specifies the text to display. + /// A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user. + public static MessageBoxResult Show(string messageText) + { + return Show(messageText, string.Empty, MessageBoxButton.OK); + } + + /// + /// Displays a message box that has a message and title bar caption; and that returns a result. + /// + /// A System.String that specifies the text to display. + /// A System.String that specifies the title bar caption to display. + /// A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user. + public static MessageBoxResult Show(string messageText, string caption) + { + return Show(messageText, caption, MessageBoxButton.OK); + } + + /// + /// Displays a message box that has a message and that returns a result. + /// + /// A System.String that specifies the text to display. + /// A System.String that specifies the title bar caption to display. + /// A System.Windows.MessageBoxButton value that specifies which button or buttons to display. + /// A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user. + public static MessageBoxResult Show(string messageText, string caption, MessageBoxButton button) + { + return ShowCore(messageText, caption, button, MessageBoxImage.None); + } + + /// + /// Displays a message box that has a message and that returns a result. + /// + /// A System.String that specifies the text to display. + /// A System.String that specifies the title bar caption to display. + /// A System.Windows.MessageBoxButton value that specifies which button or buttons to display. + /// A System.Windows.MessageBoxImage value that specifies the icon to display. + /// A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user. + public static MessageBoxResult Show(string messageText, string caption, MessageBoxButton button, MessageBoxImage icon) + { + return ShowCore(messageText, caption, button, icon); + } + + #endregion //Public Static + + #region Private Static + + private static MessageBoxResult ShowCore(string messageText, string caption, MessageBoxButton button, MessageBoxImage icon) + { + MessageBox msgBox = new MessageBox(); + msgBox.InitializeMessageBox(messageText, caption, button, icon); + msgBox.Show(); + return msgBox.MessageBoxResult; + } + + /// + /// Resolves the owner Window of the MessageBox. + /// + /// + private static FrameworkElement ResolveOwner() + { + FrameworkElement owner = null; + if (Application.Current != null) + { + foreach (Window w in Application.Current.Windows) + { + if (w.IsActive) + { + owner = w; + break; + } + } + } + return owner; + } + + #endregion //Private Static + + #region Protected + + /// + /// Shows the MessageBox + /// + protected void Show() + { + Container.ShowDialog(); + } + + /// + /// Initializes the MessageBox. + /// + /// The text. + /// The caption. + /// The button. + /// The image. + protected void InitializeMessageBox(string text, string caption, MessageBoxButton button, MessageBoxImage image) + { + Text = text; + Caption = caption; + _button = button; + SetImageSource(image); + Container = CreateContainer(); + } + + /// + /// Changes the control's visual state(s). + /// + /// name of the state + /// True if state transitions should be used. + protected void ChangeVisualState(string name, bool useTransitions) + { + VisualStateManager.GoToState(this, name, useTransitions); + } + + #endregion //Protected + + #region Private + + /// + /// Sets the message image source. + /// + /// The image to show. + private void SetImageSource(MessageBoxImage image) + { + String iconName = String.Empty; + + switch (image) + { + case MessageBoxImage.Error: + { + iconName = "Error48.png"; + break; + } + case MessageBoxImage.Information: + { + iconName = "Information48.png"; + break; + } + case MessageBoxImage.Question: + { + iconName = "Question48.png"; + break; + } + case MessageBoxImage.Warning: + { + iconName = "Warning48.png"; + break; + } + case MessageBoxImage.None: + default: + { + return; + } + } + + ImageSource = (ImageSource)new ImageSourceConverter().ConvertFromString(String.Format("pack://application:,,,/WPFToolkit.Extended;component/MessageBox/Icons/{0}", iconName)); + } + + /// + /// Creates the container which will host the MessageBox control. + /// + /// + private Window CreateContainer() + { + return new Window() + { + AllowsTransparency = true, + Background = Brushes.Transparent, + Content = this, + Owner = Window.GetWindow(ResolveOwner()), + ShowInTaskbar = false, + SizeToContent = System.Windows.SizeToContent.WidthAndHeight, + ResizeMode = System.Windows.ResizeMode.NoResize, + WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner, + WindowStyle = System.Windows.WindowStyle.None + }; + } + + #endregion //Private + + #endregion //Methods + + #region Event Handlers + + /// + /// Processes the move of a drag operation on the header. + /// + /// The instance containing the event data. + private void ProcessMove(DragDeltaEventArgs e) + { + Container.Left = Container.Left + e.HorizontalChange; + Container.Top = Container.Top + e.VerticalChange; + } + + /// + /// Sets the MessageBoxResult according to the button pressed and then closes the MessageBox. + /// + /// The source of the event. + /// The instance containing the event data. + private void Button_Click(object sender, RoutedEventArgs e) + { + Button button = e.Source as Button; + switch (button.Name) + { + case "PART_NoButton": + case "PART_NoButton1": + MessageBoxResult = MessageBoxResult.No; + break; + case "PART_YesButton": + case "PART_YesButton1": + MessageBoxResult = MessageBoxResult.Yes; + break; + case "PART_CancelButton": + case "PART_CancelButton1": + MessageBoxResult = MessageBoxResult.Cancel; + break; + case "PART_OkButton": + case "PART_OkButton1": + MessageBoxResult = MessageBoxResult.OK; + break; + } + + Close(); + } + + /// + /// Closes the MessageBox. + /// + private void Close() + { + Container.Close(); + } + + #endregion //Event Handlers + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/VisualStates.MessageBox.cs new file mode 100644 index 00000000..d47fcb08 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/VisualStates.MessageBox.cs @@ -0,0 +1,17 @@ +using System; + +namespace Microsoft.Windows.Controls +{ + internal static partial class VisualStates + { + public const string MessageBoxButtonsGroup = "MessageBoxButtonsGroup"; + + public const string OK = "OK"; + + public const string OKCancel = "OKCancel"; + + public const string YesNo = "YesNo"; + + public const string YesNoCancel = "YesNoCancel"; + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs new file mode 100644 index 00000000..b2b9dd9f --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs @@ -0,0 +1,187 @@ +using System; +using System.Windows; +using System.Globalization; + +namespace Microsoft.Windows.Controls +{ + + public class NumericUpDown : UpDownBase + { + #region Properties + + #region Minimum + + public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register("Minimum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(Double.MinValue, OnMinimumPropertyChanged)); + public double Minimum + { + get { return (double)GetValue(MinimumProperty); } + set { SetValue(MinimumProperty, value); } + } + + private static void OnMinimumPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + } + + protected virtual void OnMinimumChanged(double oldValue, double newValue) + { + } + #endregion Minimum + + #region Maximum + + public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register("Maximum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(Double.MaxValue, OnMaximumPropertyChanged)); + public double Maximum + { + get { return (double)GetValue(MaximumProperty); } + set { SetValue(MaximumProperty, value); } + } + + private static void OnMaximumPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + } + + protected virtual void OnMaximumChanged(double oldValue, double newValue) + { + } + #endregion Maximum + + #region Increment + + public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register("Increment", typeof(double), typeof(NumericUpDown), new PropertyMetadata(1d, OnIncrementPropertyChanged)); + public double Increment + { + get { return (double)GetValue(IncrementProperty); } + set { SetValue(IncrementProperty, value); } + } + + private static void OnIncrementPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + } + + protected virtual void OnIncrementChanged(double oldValue, double newValue) + { + } + + #endregion + + #region FormatString + + public static readonly DependencyProperty StringFormatProperty = DependencyProperty.Register("FormatString", typeof(string), typeof(NumericUpDown), new PropertyMetadata("F0", OnStringFormatPropertyPropertyChanged)); + public string FormatString + { + get { return (string)GetValue(StringFormatProperty); } + set { SetValue(StringFormatProperty, value); } + } + + private static void OnStringFormatPropertyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + NumericUpDown nud = d as NumericUpDown; + nud.OnStringFormatChanged(e.OldValue.ToString(), e.NewValue.ToString()); + } + + protected virtual void OnStringFormatChanged(string oldValue, string newValue) + { + Text = FormatValue(); + } + + #endregion //FormatString + + #endregion + + #region Constructors + + public NumericUpDown() + : base() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(NumericUpDown), new FrameworkPropertyMetadata(typeof(NumericUpDown))); + } + + #endregion //Constructors + + #region Base Class Overrides + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + SetValidSpinDirection(); + } + + protected override void OnValueChanged(RoutedPropertyChangedEventArgs e) + { + SetValidSpinDirection(); + } + + protected override double ParseValue(string text) + { + NumberFormatInfo info = NumberFormatInfo.GetInstance(CultureInfo.CurrentCulture); + if (text.Contains(info.PercentSymbol)) + return TryParcePercent(text, info); + else + return TryParceDouble(text, info); + } + + protected internal override string FormatValue() + { + return Value.ToString(FormatString, CultureInfo.CurrentCulture); + } + + protected override void OnIncrement() + { + Value = (double)((decimal)Value + (decimal)Increment); + } + + protected override void OnDecrement() + { + Value = (double)((decimal)Value - (decimal)Increment); + } + + #endregion //Base Class Overrides + + #region Methods + + /// + /// Sets the valid spin direction based on current value, minimum and maximum. + /// + private void SetValidSpinDirection() + { + ValidSpinDirections validDirections = ValidSpinDirections.None; + + if (Value < Maximum) + { + validDirections = validDirections | ValidSpinDirections.Increase; + } + + if (Value > Minimum) + { + validDirections = validDirections | ValidSpinDirections.Decrease; + } + + if (Spinner != null) + { + Spinner.ValidSpinDirection = validDirections; + } + } + + private double TryParcePercent(string text, NumberFormatInfo info) + { + double result; + text = text.Replace(info.PercentSymbol, null); + result = TryParceDouble(text, info); + return result / 100; + } + + private double TryParceDouble(string text, NumberFormatInfo info) + { + double result; + if (!double.TryParse(text, NumberStyles.Any, info, out result)) + { + //an error occured now lets reset our value, text, and the text in the textbox + result = Value; + TextBox.Text = Text = FormatValue(); + } + return result; + } + + #endregion //Methods + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs new file mode 100644 index 00000000..8917394e --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.261 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Xceed.Wpf.Toolkit.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xceed.Wpf.Toolkit.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Resources.resx b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Resources.resx new file mode 100644 index 00000000..ffecec85 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs new file mode 100644 index 00000000..6ec402eb --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.261 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Xceed.Wpf.Toolkit.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Settings.settings b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Settings.settings new file mode 100644 index 00000000..8f2fd95d --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs new file mode 100644 index 00000000..1aafa787 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs @@ -0,0 +1,33 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors +{ + public class DateTimeUpDownEditor : TypeEditor + { + protected override void SetControlProperties() + { + Editor.BorderThickness = new System.Windows.Thickness( 0 ); + } + protected override void SetValueDependencyProperty() + { + ValueProperty = DateTimeUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs new file mode 100644 index 00000000..b778bcfc --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs @@ -0,0 +1,34 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors +{ + public class DecimalUpDownEditor : TypeEditor + { + protected override void SetControlProperties() + { + Editor.BorderThickness = new System.Windows.Thickness( 0 ); + } + + protected override void SetValueDependencyProperty() + { + ValueProperty = DecimalUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs new file mode 100644 index 00000000..ce2b6ded --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs @@ -0,0 +1,34 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors +{ + public class DoubleUpDownEditor : TypeEditor + { + protected override void SetControlProperties() + { + Editor.BorderThickness = new System.Windows.Thickness( 0 ); + } + + protected override void SetValueDependencyProperty() + { + ValueProperty = DoubleUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs new file mode 100644 index 00000000..6d4c6491 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs @@ -0,0 +1,33 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors +{ + public class IntegerUpDownEditor : TypeEditor + { + protected override void SetControlProperties() + { + Editor.BorderThickness = new System.Windows.Thickness( 0 ); + } + protected override void SetValueDependencyProperty() + { + ValueProperty = IntegerUpDown.ValueProperty; + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml new file mode 100644 index 00000000..d9cdbe16 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Images/delete8.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Images/delete8.png new file mode 100644 index 00000000..153a6c82 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Images/delete8.png differ diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml new file mode 100644 index 00000000..1270e6d1 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml @@ -0,0 +1,78 @@ + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs new file mode 100644 index 00000000..aed90390 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs @@ -0,0 +1,321 @@ +using System; +using System.Windows.Input; +using System.Windows.Controls; +using System.Windows; + +namespace Microsoft.Windows.Controls +{ + public abstract class UpDownBase : Control + { + #region Members + + /// + /// Name constant for Text template part. + /// + internal const string ElementTextName = "Text"; + + /// + /// Name constant for Spinner template part. + /// + internal const string ElementSpinnerName = "Spinner"; + + /// + /// Flags if the Text and Value properties are in the process of being sync'd + /// + bool _isSyncingTextAndValueProperties; + + #endregion //Members + + #region Properties + + #region Value + + public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(T), typeof(UpDownBase), new FrameworkPropertyMetadata(default(T), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValuePropertyChanged)); + public virtual T Value + { + get { return (T)GetValue(ValueProperty); } + set { SetValue(ValueProperty, value); } + } + + private static void OnValuePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + UpDownBase udb = (UpDownBase)d; + T oldValue = (T)e.OldValue; + T newValue = (T)e.NewValue; + + udb.SyncTextAndValueProperties(e.Property, e.NewValue); + + RoutedPropertyChangedEventArgs changedArgs = new RoutedPropertyChangedEventArgs(oldValue, newValue); + udb.OnValueChanged(changedArgs); + } + + protected virtual void OnValueChanged(RoutedPropertyChangedEventArgs e) + { + if (ValueChanged != null) + ValueChanged(this, e); + } + + #endregion //Value + + #region Text + + public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(UpDownBase), new FrameworkPropertyMetadata("0", FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged)); + public string Text + { + get { return (string)GetValue(TextProperty); } + set { SetValue(TextProperty, value); } + } + + private static void OnTextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + UpDownBase udb = (UpDownBase)d; + udb.SyncTextAndValueProperties(e.Property, e.NewValue); + } + + #endregion //Text + + #region IsEditable + + public static readonly DependencyProperty IsEditableProperty = DependencyProperty.Register("IsEditable", typeof(bool), typeof(UpDownBase), new PropertyMetadata(true, OnIsEditablePropertyChanged)); + public bool IsEditable + { + get { return (bool)GetValue(IsEditableProperty); } + set { SetValue(IsEditableProperty, value); } + } + + private static void OnIsEditablePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + UpDownBase source = d as UpDownBase; + source.OnIsEditableChanged((bool)e.OldValue, (bool)e.NewValue); + } + + protected virtual void OnIsEditableChanged(bool oldValue, bool newValue) + { + if (TextBox != null) + TextBox.IsReadOnly = !IsEditable; + } + + #endregion //IsEditable + + internal TextBox TextBox { get; private set; } + + private Spinner _spinner; + internal Spinner Spinner + { + get { return _spinner; } + private set + { + _spinner = value; + _spinner.Spin += OnSpinnerSpin; + } + } + + #endregion //Properties + + #region Constructors + + protected UpDownBase() { } + + #endregion //Constructors + + #region Base Class Overrides + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + TextBox = GetTemplateChild(ElementTextName) as TextBox; + Spinner = GetTemplateChild(ElementSpinnerName) as Spinner; + + if (TextBox != null) + TextBox.IsReadOnly = !IsEditable; + } + + protected override void OnPreviewKeyDown(KeyEventArgs e) + { + switch (e.Key) + { + case Key.Up: + { + DoIncrement(); + e.Handled = true; + break; + } + case Key.Down: + { + DoDecrement(); + e.Handled = true; + break; + } + case Key.Enter: + { + SyncTextAndValueProperties(UpDownBase.TextProperty, TextBox.Text); + break; + } + } + } + + protected override void OnMouseWheel(MouseWheelEventArgs e) + { + base.OnMouseWheel(e); + + if (!e.Handled) + { + if (e.Delta < 0) + { + DoDecrement(); + } + else if (0 < e.Delta) + { + DoIncrement(); + } + + e.Handled = true; + } + } + + #endregion //Base Class Overrides + + #region Methods + + #region Abstract + + /// + /// Called by ApplyValue to parse user input. + /// + /// User input. + /// Value parsed from user input. + protected abstract T ParseValue(string text); + + /// + /// Renders the value property into the textbox text. + /// + /// Formatted Value. + protected internal abstract string FormatValue(); + + /// + /// Called by OnSpin when the spin direction is SpinDirection.Increase. + /// + protected abstract void OnIncrement(); + + /// + /// Called by OnSpin when the spin direction is SpinDirection.Descrease. + /// + protected abstract void OnDecrement(); + + #endregion //Abstract + + #region Protected + + /// + /// GetValue override to return Value property as object type. + /// + /// The Value property as object type. + protected object GetValue() + { + return Value; + } + + /// + /// SetValue override to set value to Value property. + /// + /// New value. + protected void SetValue(object value) + { + Value = (T)value; + } + + #endregion //Protected + + #region Private + + /// + /// Performs an increment if conditions allow it. + /// + private void DoDecrement() + { + if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease) + { + OnDecrement(); + } + } + + /// + /// Performs a decrement if conditions allow it. + /// + private void DoIncrement() + { + if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase) + { + OnIncrement(); + } + } + + protected void SyncTextAndValueProperties(DependencyProperty p, object newValue) + { + //prevents recursive syncing properties + if (_isSyncingTextAndValueProperties) + return; + + _isSyncingTextAndValueProperties = true; + + //this only occures when the user typed in the value + if (UpDownBase.TextProperty == p) + { + SetValue(UpDownBase.ValueProperty, ParseValue(newValue.ToString())); + } + + //we need to update the text no matter what because the user could have used the spin buttons to change dthe value + //or typed in the textbox so we need to reformat the entered value. + SetValue(UpDownBase.TextProperty, FormatValue()); + + _isSyncingTextAndValueProperties = false; + } + + #endregion //Private + + #region Virtual + + /// + /// Occurs when the spinner spins. + /// + /// Event args. + protected virtual void OnSpin(SpinEventArgs e) + { + if (e == null) + throw new ArgumentNullException("e"); + + if (e.Direction == SpinDirection.Increase) + DoIncrement(); + else + DoDecrement(); + } + + #endregion //Virtual + + #endregion //Methods + + #region Event Handlers + + /// + /// Event handler for Spinner template part's Spin event. + /// + /// The Spinner template part. + /// Event args. + private void OnSpinnerSpin(object sender, SpinEventArgs e) + { + OnSpin(e); + } + + #endregion //Event Handlers + + #region Events + + /// + /// Occurs when Value property has changed. + /// + public event RoutedPropertyChangedEventHandler ValueChanged; + + #endregion //Events + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Utils/Exceptions/ThrowException.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Utils/Exceptions/ThrowException.cs new file mode 100644 index 00000000..0d8bfeec --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Utils/Exceptions/ThrowException.cs @@ -0,0 +1,70 @@ +/************************************************************************ + + Extended WPF Toolkit + + Copyright (C) 2010-2012 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 + + This program can be provided to you by Xceed Software Inc. under a + proprietary commercial license agreement for use in non-Open Source + projects. The commercial version of Extended WPF Toolkit also includes + priority technical support, commercial updates, and many additional + useful WPF controls if you license Xceed Business Suite for WPF. + + Visit http://xceed.com and follow @datagrid on Twitter. + + **********************************************************************/ + +using System; + +namespace Xceed.Utils.Exceptions +{ + internal class ThrowException + { + private ThrowException() + { + } + + #region PUBLIC STATIC METHODS + + public static void ThrowArgumentException( string message, string paramName, Exception innerExcept ) + { +#if ( XCEEDCF || SILVERLIGHT ) + throw new ArgumentException( message, innerExcept ); +#else + throw new ArgumentException( message, paramName, innerExcept ); +#endif + } + + public static void ThrowArgumentOutOfRangeException( string paramName, object value, string message ) + { +#if ( XCEEDCF || SILVERLIGHT ) + throw new ArgumentOutOfRangeException( message ); +#else + throw new ArgumentOutOfRangeException( paramName, value, message ); +#endif + } + +#if !NO_CODE_ANALYSIS + [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type" )] +#endif // !NO_CODE_ANALYSIS + public static void ThrowLicenseException( Type type, object instance, string message ) + { +#if ( XCEEDCF || SILVERLIGHT ) + throw new SystemException( message ); +#else +#if XBAP_FRIENDLY + // Under some circumstances, passing a type to a LicenseException will throw a + // FileNotFoundException on the assembly containing the type. + throw new System.ComponentModel.LicenseException( null, instance, message ); +#else + throw new System.ComponentModel.LicenseException( type, instance, message ); +#endif +#endif + } + + #endregion PUBLIC STATIC METHODS + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj.vspscc b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj.vspscc new file mode 100644 index 00000000..feffdeca --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj.vspscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" +} diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Images/Delete16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Images/Delete16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditorDialog.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditorDialog.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionEditors/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.resx b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.resx rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/IValidateInput.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/InputValidationErrorEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidContentException.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/CachedTextInfo.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/ValueRangeTextBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/QueryTextFromValueEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/QueryValueFromTextEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/NotifyPropertyChangedHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/NotifyPropertyChangedHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ReflectionHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/TreeHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ValueChangeHelper.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/InsertKeyModeEnum.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskFormatEnum.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ByteUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/CommonNumericUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/LongUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/SByteUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ShortUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/SingleUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/UIntegerUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/ULongUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/UShortUpDown.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/UpDownEditors.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/IPropertyParent.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/IPropertyParent.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png new file mode 100644 index 00000000..8fb36a1a Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png differ diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png new file mode 100644 index 00000000..1030a021 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png differ diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png new file mode 100644 index 00000000..8259a9e1 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png new file mode 100644 index 00000000..c5499bce Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png new file mode 100644 index 00000000..51dffb73 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png differ diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png new file mode 100644 index 00000000..cb8e400a Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png differ diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png new file mode 100644 index 00000000..72689482 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png differ diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/VisualStates.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/VisualStates.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WPFToolkit.Extended.csproj similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WPFToolkit.Extended.csproj diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/sn.snk b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/sn.snk similarity index 100% rename from ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/sn.snk rename to ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/sn.snk