diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs index d0386451..5187d3fa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "3.1"; + public const string BaseVersion = "3.2"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs index d0386451..5187d3fa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "3.1"; + public const string BaseVersion = "3.2"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs index d0386451..5187d3fa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "3.1"; + public const string BaseVersion = "3.2"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs index d0386451..5187d3fa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "3.1"; + public const string BaseVersion = "3.2"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs index cee976ec..048554c0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs @@ -26,66 +26,73 @@ using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { - public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer + public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer + { + static LayoutAnchorablePaneControl() { - static LayoutAnchorablePaneControl() - { - FocusableProperty.OverrideMetadata(typeof(LayoutAnchorablePaneControl), new FrameworkPropertyMetadata(false)); - } + FocusableProperty.OverrideMetadata( typeof( LayoutAnchorablePaneControl ), new FrameworkPropertyMetadata( false ) ); + } - public LayoutAnchorablePaneControl(LayoutAnchorablePane model) - { - if (model == null) - throw new ArgumentNullException("model"); + public LayoutAnchorablePaneControl( LayoutAnchorablePane model ) + { + if( model == null ) + throw new ArgumentNullException( "model" ); - _model = model; + _model = model; - SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this }); - SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this }); + SetBinding( ItemsSourceProperty, new Binding( "Model.Children" ) { Source = this } ); + SetBinding( FlowDirectionProperty, new Binding( "Model.Root.Manager.FlowDirection" ) { Source = this } ); - this.LayoutUpdated += new EventHandler(OnLayoutUpdated); - } + this.LayoutUpdated += new EventHandler( OnLayoutUpdated ); + } - void OnLayoutUpdated(object sender, EventArgs e) - { - var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize; - modelWithAtcualSize.ActualWidth = ActualWidth; - modelWithAtcualSize.ActualHeight = ActualHeight; - } + void OnLayoutUpdated( object sender, EventArgs e ) + { + var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize; + modelWithAtcualSize.ActualWidth = ActualWidth; + modelWithAtcualSize.ActualHeight = ActualHeight; + } - LayoutAnchorablePane _model; + LayoutAnchorablePane _model; - public ILayoutElement Model - { - get { return _model; } - } + public ILayoutElement Model + { + get + { + return _model; + } + } - protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e) - { - if ((_model != null) && (_model.SelectedContent != null)) - { - _model.SelectedContent.IsActive = true; - } + protected override void OnGotKeyboardFocus( System.Windows.Input.KeyboardFocusChangedEventArgs e ) + { + if( ( _model != null ) && ( _model.SelectedContent != null ) ) + { + _model.SelectedContent.IsActive = true; + } - base.OnGotKeyboardFocus(e); - } + base.OnGotKeyboardFocus( e ); + } - protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e) - { - base.OnMouseLeftButtonDown(e); + protected override void OnMouseLeftButtonDown( System.Windows.Input.MouseButtonEventArgs e ) + { + base.OnMouseLeftButtonDown( e ); - if (!e.Handled && _model.SelectedContent != null) - _model.SelectedContent.IsActive = true; - } + if( !e.Handled && ( _model != null ) && ( _model.SelectedContent != null ) ) + { + _model.SelectedContent.IsActive = true; + } + } - protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e) - { - base.OnMouseRightButtonDown(e); + protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButtonEventArgs e ) + { + base.OnMouseRightButtonDown( e ); - if (!e.Handled && _model.SelectedContent != null) - _model.SelectedContent.IsActive = true; + if( !e.Handled && ( _model != null ) && ( _model.SelectedContent != null ) ) + { + _model.SelectedContent.IsActive = true; + } + } - } + } - } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs index 856260cf..f376bd89 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs @@ -28,197 +28,203 @@ using System.Diagnostics; namespace Xceed.Wpf.AvalonDock.Controls { - public class LayoutAnchorableTabItem : Control - { - static LayoutAnchorableTabItem() - { - DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorableTabItem), new FrameworkPropertyMetadata(typeof(LayoutAnchorableTabItem))); - } - - public LayoutAnchorableTabItem() - { - } - - - - #region Model - - /// - /// Model Dependency Property - /// - public static readonly DependencyProperty ModelProperty = - DependencyProperty.Register("Model", typeof(LayoutContent), typeof(LayoutAnchorableTabItem), - new FrameworkPropertyMetadata((LayoutContent)null, - new PropertyChangedCallback(OnModelChanged))); - - /// - /// Gets or sets the Model property. This dependency property - /// indicates model attached to the anchorable tab item. - /// - public LayoutContent Model - { - get { return (LayoutContent)GetValue(ModelProperty); } - set { SetValue(ModelProperty, value); } - } - - /// - /// Handles changes to the Model property. - /// - private static void OnModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) - { - ((LayoutAnchorableTabItem)d).OnModelChanged(e); - } - - /// - /// Provides derived classes an opportunity to handle changes to the Model property. - /// - protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e) - { - if (Model != null) - SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model)); - else - SetLayoutItem(null); - //UpdateLogicalParent(); - } - - #endregion - - #region LayoutItem - - /// - /// LayoutItem Read-Only Dependency Property - /// - private static readonly DependencyPropertyKey LayoutItemPropertyKey - = DependencyProperty.RegisterReadOnly("LayoutItem", typeof(LayoutItem), typeof(LayoutAnchorableTabItem), - new FrameworkPropertyMetadata((LayoutItem)null)); - - public static readonly DependencyProperty LayoutItemProperty - = LayoutItemPropertyKey.DependencyProperty; - - /// - /// Gets the LayoutItem property. This dependency property - /// indicates the LayoutItem attached to this tag item. - /// - public LayoutItem LayoutItem - { - get { return (LayoutItem)GetValue(LayoutItemProperty); } - } - - /// - /// Provides a secure method for setting the LayoutItem property. - /// This dependency property indicates the LayoutItem attached to this tag item. - /// - /// The new value for the property. - protected void SetLayoutItem(LayoutItem value) - { - SetValue(LayoutItemPropertyKey, value); - } - - #endregion - - private bool _isMouseDown = false; - private static LayoutAnchorableTabItem _draggingItem = null; - // There's an issue with panes resizing when selecting another tab, causing a - // mouse leave event to make the tab undock. This fixes that. - private static bool _cancelNextMouseLeave = false; - - internal static bool IsDraggingItem() - { - return _draggingItem != null; - } - - internal static LayoutAnchorableTabItem GetDraggingItem() - { - return _draggingItem; - } - internal static void ResetDraggingItem() - { - _draggingItem = null; - } - internal static void CancelNextMouseLeave() - { - _cancelNextMouseLeave = true; - } - - protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e) - { - base.OnMouseLeftButtonDown(e); - - _isMouseDown = true; - _draggingItem = this; - } - - protected override void OnMouseMove(System.Windows.Input.MouseEventArgs e) - { - base.OnMouseMove(e); - - if (e.LeftButton != MouseButtonState.Pressed) - { - _isMouseDown = false; - _draggingItem = null; - } - else - { - _cancelNextMouseLeave = false; - } - - } - - protected override void OnMouseLeftButtonUp(System.Windows.Input.MouseButtonEventArgs e) - { - _isMouseDown = false; - - base.OnMouseLeftButtonUp(e); - - Model.IsActive = true; - } - - protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e) - { - base.OnMouseLeave(e); - - if (_isMouseDown && e.LeftButton == MouseButtonState.Pressed) - { - if (!_cancelNextMouseLeave) - { - _draggingItem = this; - } - else - { - _draggingItem = null; - } - } - - _isMouseDown = false; - _cancelNextMouseLeave = false; - } - - protected override void OnMouseEnter(MouseEventArgs e) - { - base.OnMouseEnter(e); - - if (_draggingItem != null && - _draggingItem != this && - e.LeftButton == MouseButtonState.Pressed) - { - var model = Model; - var container = model.Parent as ILayoutContainer; - var containerPane = model.Parent as ILayoutPane; - - if( (containerPane is LayoutAnchorablePane) && !((LayoutAnchorablePane)containerPane).CanRepositionItems ) - return; - if( (containerPane.Parent != null) && (containerPane.Parent is LayoutAnchorablePaneGroup) && !((LayoutAnchorablePaneGroup)containerPane.Parent).CanRepositionItems ) - return; - - var childrenList = container.Children.ToList(); - containerPane.MoveChild( childrenList.IndexOf( _draggingItem.Model ), childrenList.IndexOf( model ) ); - } - } - - protected override void OnPreviewGotKeyboardFocus(KeyboardFocusChangedEventArgs e) - { - base.OnPreviewGotKeyboardFocus(e); - - } + public class LayoutAnchorableTabItem : Control + { + #region Members + + private bool _isMouseDown = false; + private static LayoutAnchorableTabItem _draggingItem = null; + private static bool _cancelMouseLeave = false; + + #endregion + + static LayoutAnchorableTabItem() + { + DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutAnchorableTabItem ), new FrameworkPropertyMetadata( typeof( LayoutAnchorableTabItem ) ) ); + } + + public LayoutAnchorableTabItem() + { + } + + + + #region Model + + /// + /// Model Dependency Property + /// + public static readonly DependencyProperty ModelProperty = + DependencyProperty.Register( "Model", typeof( LayoutContent ), typeof( LayoutAnchorableTabItem ), + new FrameworkPropertyMetadata( (LayoutContent)null, + new PropertyChangedCallback( OnModelChanged ) ) ); + + /// + /// Gets or sets the Model property. This dependency property + /// indicates model attached to the anchorable tab item. + /// + public LayoutContent Model + { + get + { + return (LayoutContent)GetValue( ModelProperty ); + } + set + { + SetValue( ModelProperty, value ); + } + } + + /// + /// Handles changes to the Model property. + /// + private static void OnModelChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) + { + ( (LayoutAnchorableTabItem)d ).OnModelChanged( e ); + } + + /// + /// Provides derived classes an opportunity to handle changes to the Model property. + /// + protected virtual void OnModelChanged( DependencyPropertyChangedEventArgs e ) + { + if( Model != null ) + SetLayoutItem( Model.Root.Manager.GetLayoutItemFromModel( Model ) ); + else + SetLayoutItem( null ); + //UpdateLogicalParent(); + } + + #endregion + + #region LayoutItem + + /// + /// LayoutItem Read-Only Dependency Property + /// + private static readonly DependencyPropertyKey LayoutItemPropertyKey + = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( LayoutAnchorableTabItem ), + new FrameworkPropertyMetadata( (LayoutItem)null ) ); + + public static readonly DependencyProperty LayoutItemProperty + = LayoutItemPropertyKey.DependencyProperty; + + /// + /// Gets the LayoutItem property. This dependency property + /// indicates the LayoutItem attached to this tag item. + /// + public LayoutItem LayoutItem + { + get + { + return (LayoutItem)GetValue( LayoutItemProperty ); + } + } + + /// + /// Provides a secure method for setting the LayoutItem property. + /// This dependency property indicates the LayoutItem attached to this tag item. + /// + /// The new value for the property. + protected void SetLayoutItem( LayoutItem value ) + { + SetValue( LayoutItemPropertyKey, value ); + } + + #endregion + + protected override void OnMouseLeftButtonDown( System.Windows.Input.MouseButtonEventArgs e ) + { + base.OnMouseLeftButtonDown( e ); + + _isMouseDown = true; + _draggingItem = this; + } + + protected override void OnMouseMove( System.Windows.Input.MouseEventArgs e ) + { + base.OnMouseMove( e ); + + if( e.LeftButton != MouseButtonState.Pressed ) + { + _isMouseDown = false; + _draggingItem = null; + } + else + { + _cancelMouseLeave = false; + } + } + + protected override void OnMouseLeftButtonUp( System.Windows.Input.MouseButtonEventArgs e ) + { + _isMouseDown = false; + + base.OnMouseLeftButtonUp( e ); + + Model.IsActive = true; + } + + protected override void OnMouseLeave( System.Windows.Input.MouseEventArgs e ) + { + base.OnMouseLeave( e ); + + if( _isMouseDown && e.LeftButton == MouseButtonState.Pressed ) + { + // drag the item if the mouse leave is not canceled. + // Mouse leave should be canceled when selecting a new tab to prevent automatic undock when Panel size is Auto. + _draggingItem = !_cancelMouseLeave ? this : null; + } + + _isMouseDown = false; + _cancelMouseLeave = false; + } + + protected override void OnMouseEnter( MouseEventArgs e ) + { + base.OnMouseEnter( e ); + + if( _draggingItem != null && + _draggingItem != this && + e.LeftButton == MouseButtonState.Pressed ) + { + var model = Model; + var container = model.Parent as ILayoutContainer; + var containerPane = model.Parent as ILayoutPane; + + if( ( containerPane is LayoutAnchorablePane ) && !( (LayoutAnchorablePane)containerPane ).CanRepositionItems ) + return; + if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutAnchorablePaneGroup ) && !( (LayoutAnchorablePaneGroup)containerPane.Parent ).CanRepositionItems ) + return; + + var childrenList = container.Children.ToList(); + containerPane.MoveChild( childrenList.IndexOf( _draggingItem.Model ), childrenList.IndexOf( model ) ); + } + } + + protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e ) + { + base.OnPreviewGotKeyboardFocus( e ); + + } + + internal static bool IsDraggingItem() + { + return _draggingItem != null; + } + + internal static LayoutAnchorableTabItem GetDraggingItem() + { + return _draggingItem; + } + internal static void ResetDraggingItem() + { + _draggingItem = null; + } + + internal static void CancelMouseLeave() + { + _cancelMouseLeave = true; } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs index d3063cad..d2cbe8b3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs @@ -36,6 +36,7 @@ namespace Xceed.Wpf.AvalonDock.Controls public abstract class LayoutFloatingWindowControl : Window, ILayoutControl { private ResourceDictionary currentThemeResourceDictionary; // = null + private bool _isInternalChange; //false static LayoutFloatingWindowControl() { @@ -387,7 +388,9 @@ namespace Xceed.Wpf.AvalonDock.Controls posElement.IsMaximized = isMaximized; } IsMaximized = isMaximized; + _isInternalChange = true; WindowState = isMaximized ? WindowState.Maximized : WindowState.Normal; + _isInternalChange = false; } @@ -529,19 +532,21 @@ namespace Xceed.Wpf.AvalonDock.Controls protected override void OnStateChanged( EventArgs e ) { - //Windows sometimes send unwanted state changes (when minimizing application for instance) - //We force internal state to be used - WindowState = IsMaximized ? WindowState.Maximized : WindowState.Normal; + if( !_isInternalChange ) + { + if( WindowState == WindowState.Maximized ) + { + UpdateMaximizedState( true ); + } + else + { + WindowState = IsMaximized ? WindowState.Maximized : WindowState.Normal; + } + } + base.OnStateChanged( e ); } #endregion - - - - - - - } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs index 94d4f831..de21dc28 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs @@ -380,62 +380,50 @@ namespace Xceed.Wpf.AvalonDock.Controls var prevChildModel = (ILayoutPositionableElement)(prevChild as ILayoutControl).Model; var nextChildModel = (ILayoutPositionableElement)(nextChild as ILayoutControl).Model; - if (Orientation == System.Windows.Controls.Orientation.Horizontal) - { - if (prevChildModel.DockWidth.IsStar) - { - prevChildModel.DockWidth = new GridLength(prevChildModel.DockWidth.Value * (prevChildActualSize.Width + delta) / prevChildActualSize.Width, GridUnitType.Star); - } - else if (prevChildModel.DockWidth.IsAuto) - { - prevChildModel.DockWidth = new GridLength(prevChildActualSize.Width + delta, GridUnitType.Pixel); - } - else - { - prevChildModel.DockWidth = new GridLength(prevChildModel.DockWidth.Value + delta, GridUnitType.Pixel); - } + if( Orientation == System.Windows.Controls.Orientation.Horizontal ) + { + if( prevChildModel.DockWidth.IsStar ) + { + prevChildModel.DockWidth = new GridLength( prevChildModel.DockWidth.Value * ( prevChildActualSize.Width + delta ) / prevChildActualSize.Width, GridUnitType.Star ); + } + else + { + var width = ( prevChildModel.DockWidth.IsAuto ) ? prevChildActualSize.Width : prevChildModel.DockWidth.Value; + prevChildModel.DockWidth = new GridLength( width + delta, GridUnitType.Pixel ); + } - if (nextChildModel.DockWidth.IsStar) - { - nextChildModel.DockWidth = new GridLength(nextChildModel.DockWidth.Value * (nextChildActualSize.Width - delta) / nextChildActualSize.Width, GridUnitType.Star); - } - else if (nextChildModel.DockWidth.IsAuto) - { - nextChildModel.DockWidth = new GridLength(nextChildActualSize.Width - delta, GridUnitType.Pixel); - } - else - { - nextChildModel.DockWidth = new GridLength(nextChildModel.DockWidth.Value - delta, GridUnitType.Pixel); - } - } - else - { - if (prevChildModel.DockHeight.IsStar) - { - prevChildModel.DockHeight = new GridLength(prevChildModel.DockHeight.Value * (prevChildActualSize.Height + delta) / prevChildActualSize.Height, GridUnitType.Star); - } - else if (prevChildModel.DockHeight.IsAuto) - { - prevChildModel.DockHeight = new GridLength(prevChildActualSize.Height + delta, GridUnitType.Pixel); - } - else - { - prevChildModel.DockHeight = new GridLength(prevChildModel.DockHeight.Value + delta, GridUnitType.Pixel); - } + if( nextChildModel.DockWidth.IsStar ) + { + nextChildModel.DockWidth = new GridLength( nextChildModel.DockWidth.Value * ( nextChildActualSize.Width - delta ) / nextChildActualSize.Width, GridUnitType.Star ); + } + else + { + var width = ( nextChildModel.DockWidth.IsAuto ) ? nextChildActualSize.Width : nextChildModel.DockWidth.Value; + nextChildModel.DockWidth = new GridLength( width - delta, GridUnitType.Pixel ); + } + } + else + { + if( prevChildModel.DockHeight.IsStar ) + { + prevChildModel.DockHeight = new GridLength( prevChildModel.DockHeight.Value * ( prevChildActualSize.Height + delta ) / prevChildActualSize.Height, GridUnitType.Star ); + } + else + { + var height = ( prevChildModel.DockHeight.IsAuto ) ? prevChildActualSize.Height : prevChildModel.DockHeight.Value; + prevChildModel.DockHeight = new GridLength( height + delta, GridUnitType.Pixel ); + } - if (nextChildModel.DockHeight.IsStar) - { - nextChildModel.DockHeight = new GridLength(nextChildModel.DockHeight.Value * (nextChildActualSize.Height - delta) / nextChildActualSize.Height, GridUnitType.Star); - } - else if (nextChildModel.DockHeight.IsAuto) - { - nextChildModel.DockHeight = new GridLength(nextChildActualSize.Height - delta, GridUnitType.Pixel); - } - else - { - nextChildModel.DockHeight = new GridLength(nextChildModel.DockHeight.Value - delta, GridUnitType.Pixel); - } - } + if( nextChildModel.DockHeight.IsStar ) + { + nextChildModel.DockHeight = new GridLength( nextChildModel.DockHeight.Value * ( nextChildActualSize.Height - delta ) / nextChildActualSize.Height, GridUnitType.Star ); + } + else + { + var height = ( nextChildModel.DockHeight.IsAuto ) ? nextChildActualSize.Height : nextChildModel.DockHeight.Value; + nextChildModel.DockHeight = new GridLength( height - delta, GridUnitType.Pixel ); + } + } HideResizerOverlayWindow(); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs index 374952b6..683c95af 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs @@ -203,17 +203,17 @@ namespace Xceed.Wpf.AvalonDock.Controls { _view = new ContentPresenter(); - _view.SetBinding(ContentPresenter.ContentProperty, new Binding("Content") { Source = LayoutElement }); - if ((LayoutElement != null) && (LayoutElement.Root != null)) - { - _view.SetBinding(ContentPresenter.ContentTemplateProperty, new Binding("LayoutItemTemplate") { Source = LayoutElement.Root.Manager }); - _view.SetBinding(ContentPresenter.ContentTemplateSelectorProperty, new Binding("LayoutItemTemplateSelector") { Source = LayoutElement.Root.Manager }); - if (LayoutElement.Root.Manager != null) - { - LayoutElement.Root.Manager.InternalAddLogicalChild(_view); - } - } - } + _view.SetBinding( ContentPresenter.ContentProperty, new Binding( "Content" ) { Source = LayoutElement } ); + if( ( LayoutElement != null ) && ( LayoutElement.Root != null ) ) + { + _view.SetBinding( ContentPresenter.ContentTemplateProperty, new Binding( "LayoutItemTemplate" ) { Source = LayoutElement.Root.Manager } ); + _view.SetBinding( ContentPresenter.ContentTemplateSelectorProperty, new Binding( "LayoutItemTemplateSelector" ) { Source = LayoutElement.Root.Manager } ); + if( LayoutElement.Root.Manager != null ) + { + LayoutElement.Root.Manager.InternalAddLogicalChild( _view ); + } + } + } return _view; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs index bc3d88b2..ee618808 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs @@ -209,7 +209,8 @@ namespace Xceed.Wpf.AvalonDock.Controls yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetTop.GetScreenArea(), DropTargetType.AnchorablePaneDockTop); yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetRight.GetScreenArea(), DropTargetType.AnchorablePaneDockRight); yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetBottom.GetScreenArea(), DropTargetType.AnchorablePaneDockBottom); - yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetInto.GetScreenArea(), DropTargetType.AnchorablePaneDockInside); + if( _anchorablePaneDropTargetInto.IsVisible ) + yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetInto.GetScreenArea(), DropTargetType.AnchorablePaneDockInside); var parentPaneModel = dropAreaAnchorablePane.AreaElement.Model as LayoutAnchorablePane; LayoutAnchorableTabItem lastAreaTabItem = null; @@ -342,6 +343,137 @@ namespace Xceed.Wpf.AvalonDock.Controls _floatingWindow = null; } + /// + /// This method controls the DropTargetInto button of the overlay window. + /// It checks that only 1 of the defined ContentLayouts can be present on the LayoutDocumentPane or LayoutAnchorablePane. + /// The combination between the ContentLayout Title and the ContentId is the search key, and has to be unique. + /// If a floating window is dropped on a LayoutDocumentPane or LayoutAnchorablePane, it checks if one of the containing LayoutContents + /// is already present on the LayoutDocumentPane or LayoutAnchorablePane. If so, then it will disable the DropTargetInto button. + /// + /// The given LayoutDocumentPane or LayoutAnchorablePane + private void SetDropTargetIntoVisibility( ILayoutPositionableElement positionableElement ) + { + if( positionableElement is LayoutAnchorablePane ) + { + _anchorablePaneDropTargetInto.Visibility = Visibility.Visible; + } + else if( positionableElement is LayoutDocumentPane ) + { + _documentPaneDropTargetInto.Visibility = Visibility.Visible; + } + + if( positionableElement == null || _floatingWindow.Model == null || positionableElement.AllowDuplicateContent ) + { + return; + } + + // Find all content layouts in the anchorable pane (object to drop on) + var contentLayoutsOnPositionableElementPane = GetAllLayoutContents( positionableElement ); + + // Find all content layouts in the floating window (object to drop) + var contentLayoutsOnFloatingWindow = GetAllLayoutContents( _floatingWindow.Model ); + + // If any of the content layouts is present in the drop area, then disable the DropTargetInto button. + foreach( var content in contentLayoutsOnFloatingWindow ) + { + if( !contentLayoutsOnPositionableElementPane.Any( item => + item.Title == content.Title && + item.ContentId == content.ContentId ) ) + { + continue; + } + + if( positionableElement is LayoutAnchorablePane ) + { + _anchorablePaneDropTargetInto.Visibility = Visibility.Hidden; + } + else if( positionableElement is LayoutDocumentPane ) + { + _documentPaneDropTargetInto.Visibility = Visibility.Hidden; + } + break; + } + } + + /// + /// Find any LayoutDocument or LayoutAnchorable from a given source (e.g. LayoutDocumentPane, LayoutAnchorableFloatingWindow, etc.) + /// + /// The given source to search in + /// A list of all LayoutContent's + private List GetAllLayoutContents( object source ) + { + var result = new List(); + + var documentFloatingWindow = source as LayoutDocumentFloatingWindow; + if( documentFloatingWindow != null ) + { + foreach( var layoutElement in documentFloatingWindow.Children ) + { + result.AddRange( GetAllLayoutContents( layoutElement ) ); + } + } + + var anchorableFloatingWindow = source as LayoutAnchorableFloatingWindow; + if( anchorableFloatingWindow != null ) + { + foreach( var layoutElement in anchorableFloatingWindow.Children ) + { + result.AddRange( GetAllLayoutContents( layoutElement ) ); + } + } + + var documentPaneGroup = source as LayoutDocumentPaneGroup; + if( documentPaneGroup != null ) + { + foreach( var layoutDocumentPane in documentPaneGroup.Children ) + { + result.AddRange( GetAllLayoutContents( layoutDocumentPane ) ); + } + } + + var anchorablePaneGroup = source as LayoutAnchorablePaneGroup; + if( anchorablePaneGroup != null ) + { + foreach( var layoutDocumentPane in anchorablePaneGroup.Children ) + { + result.AddRange( GetAllLayoutContents( layoutDocumentPane ) ); + } + } + + var documentPane = source as LayoutDocumentPane; + if( documentPane != null ) + { + foreach( var layoutContent in documentPane.Children ) + { + result.Add( layoutContent ); + } + } + + var anchorablePane = source as LayoutAnchorablePane; + if( anchorablePane != null ) + { + foreach( var layoutContent in anchorablePane.Children ) + { + result.Add( layoutContent ); + } + } + + var document = source as LayoutDocument; + if( document != null ) + { + result.Add( document ); + } + + var anchorable = source as LayoutAnchorable; + if( anchorable != null ) + { + result.Add( anchorable ); + } + + return result; + } + + protected override void OnClosing(System.ComponentModel.CancelEventArgs e) { base.OnClosing(e); @@ -361,7 +493,11 @@ namespace Xceed.Wpf.AvalonDock.Controls break; case DropAreaType.AnchorablePane: areaElement = _gridAnchorablePaneDropTargets; - break; + + var dropAreaAnchorablePaneGroup = area as DropArea; + var layoutAnchorablePane = dropAreaAnchorablePaneGroup.AreaElement.Model as LayoutAnchorablePane; + SetDropTargetIntoVisibility( layoutAnchorablePane ); + break; case DropAreaType.DocumentPaneGroup: { areaElement = _gridDocumentPaneDropTargets; @@ -386,6 +522,8 @@ namespace Xceed.Wpf.AvalonDock.Controls var layoutDocumentPane = dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPane; var parentDocumentPaneGroup = layoutDocumentPane.Parent as LayoutDocumentPaneGroup; + SetDropTargetIntoVisibility( layoutDocumentPane ); + if (parentDocumentPaneGroup != null && parentDocumentPaneGroup.Children.Where(c => c.IsVisible).Count() > 1) { @@ -475,6 +613,8 @@ namespace Xceed.Wpf.AvalonDock.Controls var layoutDocumentPane = dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPane; var parentDocumentPaneGroup = layoutDocumentPane.Parent as LayoutDocumentPaneGroup; + SetDropTargetIntoVisibility( layoutDocumentPane ); + if (parentDocumentPaneGroup != null && parentDocumentPaneGroup.Children.Where(c => c.IsVisible).Count() > 1) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs index 95b1e5db..34027fe9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs @@ -39,7 +39,7 @@ namespace Xceed.Wpf.AvalonDock.Layout double DockMinWidth { get; set; } double DockMinHeight { get; set; } - + bool AllowDuplicateContent { get; set; } bool IsVisible { get; } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs index 12500be7..0cbd88b3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs @@ -21,6 +21,7 @@ using System.Text; using System.Windows.Markup; using System.Diagnostics; using System.Xml.Serialization; +using System.Xml; namespace Xceed.Wpf.AvalonDock.Layout { @@ -156,11 +157,15 @@ namespace Xceed.Wpf.AvalonDock.Layout void ILayoutElementWithVisibility.ComputeVisibility() { - if (RootPanel != null) - IsVisible = RootPanel.IsVisible; - else - IsVisible = false; + ComputeVisibility(); + } + private void ComputeVisibility() + { + if( RootPanel != null ) + IsVisible = RootPanel.IsVisible; + else + IsVisible = false; } public override bool IsValid @@ -168,6 +173,53 @@ namespace Xceed.Wpf.AvalonDock.Layout get { return RootPanel != null; } } + public override void ReadXml( XmlReader reader ) + { + reader.MoveToContent(); + if( reader.IsEmptyElement ) + { + reader.Read(); + ComputeVisibility(); + return; + } + + var localName = reader.LocalName; + reader.Read(); + + while( true ) + { + if( reader.LocalName.Equals( localName ) && (reader.NodeType == XmlNodeType.EndElement) ) + { + break; + } + + if( reader.NodeType == XmlNodeType.Whitespace ) + { + reader.Read(); + continue; + } + + XmlSerializer serializer; + if( reader.LocalName.Equals("LayoutAnchorablePaneGroup") ) + { + serializer = new XmlSerializer( typeof( LayoutAnchorablePaneGroup ) ); + } + else + { + var type = LayoutRoot.FindType( reader.LocalName ); + if( type == null ) + { + throw new ArgumentException( "AvalonDock.LayoutAnchorableFloatingWindow doesn't know how to deserialize " + reader.LocalName ); + } + serializer = new XmlSerializer( type ); + } + + RootPanel = ( LayoutAnchorablePaneGroup )serializer.Deserialize( reader ); + } + + reader.ReadEndElement(); + } + #if TRACE public override void ConsoleDump(int tab) { @@ -176,6 +228,6 @@ namespace Xceed.Wpf.AvalonDock.Layout RootPanel.ConsoleDump(tab + 1); } -#endif - } +#endif + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs index e0676604..5be6de32 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs @@ -24,6 +24,7 @@ using System.Windows; using System.Globalization; using System.Windows.Media; using System.ComponentModel; +using Xceed.Wpf.AvalonDock.Controls; namespace Xceed.Wpf.AvalonDock.Layout { @@ -84,31 +85,25 @@ namespace Xceed.Wpf.AvalonDock.Layout #region ContentId - //Added to make ContentId bindable - public static DependencyProperty ContentIdProperty = - DependencyProperty.Register(nameof(ContentId), - typeof(string), typeof(LayoutContent), new FrameworkPropertyMetadata(null, (s, e) => - { - (s as LayoutContent)?.RaisePropertyChanged(nameof(ContentId)); - })); - + private string _contentId = null; public string ContentId { - get + get { - if (GetValue(ContentIdProperty) == null) - { + if (_contentId == null) + { var contentAsControl = _content as FrameworkElement; if (contentAsControl != null && !string.IsNullOrWhiteSpace(contentAsControl.Name)) return contentAsControl.Name; } - return (string)GetValue(ContentIdProperty); + return _contentId; } set { - if (!String.Equals(GetValue(ContentIdProperty) as string, value)) + if (_contentId != value) { - SetValue(ContentIdProperty, value); + _contentId = value; + RaisePropertyChanged("ContentId"); } } } @@ -133,7 +128,7 @@ namespace Xceed.Wpf.AvalonDock.Layout parentSelector.SelectedContentIndex = _isSelected ? parentSelector.IndexOf(this) : -1; OnIsSelectedChanged(oldValue, value); RaisePropertyChanged("IsSelected"); - Controls.LayoutAnchorableTabItem.CancelNextMouseLeave(); + LayoutAnchorableTabItem.CancelMouseLeave(); } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs index db08fadd..6e4018f3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs @@ -20,6 +20,8 @@ using System.Linq; using System.Text; using System.Windows.Markup; using System.Diagnostics; +using System.Xml.Serialization; +using System.Xml; namespace Xceed.Wpf.AvalonDock.Layout { @@ -92,6 +94,51 @@ namespace Xceed.Wpf.AvalonDock.Layout get { return RootDocument != null; } } + public override void ReadXml( XmlReader reader ) + { + reader.MoveToContent(); + if( reader.IsEmptyElement ) + { + reader.Read(); + return; + } + + var localName = reader.LocalName; + reader.Read(); + + while( true ) + { + if( reader.LocalName.Equals(localName) && (reader.NodeType == XmlNodeType.EndElement) ) + { + break; + } + + if( reader.NodeType == XmlNodeType.Whitespace ) + { + reader.Read(); + continue; + } + + XmlSerializer serializer; + if( reader.LocalName.Equals( "LayoutDocument" ) ) + { + serializer = new XmlSerializer( typeof( LayoutDocument ) ); + } + else + { + var type = LayoutRoot.FindType( reader.LocalName ); + if( type == null ) + { + throw new ArgumentException( "AvalonDock.LayoutDocumentFloatingWindow doesn't know how to deserialize " + reader.LocalName ); + } + serializer = new XmlSerializer( type ); + } + + RootDocument = ( LayoutDocument )serializer.Deserialize( reader ); + } + + reader.ReadEndElement(); + } #if TRACE public override void ConsoleDump(int tab) @@ -102,6 +149,6 @@ namespace Xceed.Wpf.AvalonDock.Layout RootDocument.ConsoleDump(tab + 1); } #endif - } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs index 6f174897..64fd83fd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs @@ -21,14 +21,14 @@ using System.Text; using System.Windows.Markup; using System.Windows; using System.Xml.Serialization; +using System.Xml.Schema; +using System.Xml; namespace Xceed.Wpf.AvalonDock.Layout { [Serializable] - [XmlInclude(typeof(LayoutAnchorableFloatingWindow))] - [XmlInclude(typeof(LayoutDocumentFloatingWindow))] - public abstract class LayoutFloatingWindow : LayoutElement, ILayoutContainer - { + public abstract class LayoutFloatingWindow : LayoutElement, ILayoutContainer, IXmlSerializable + { public LayoutFloatingWindow() { @@ -45,8 +45,22 @@ namespace Xceed.Wpf.AvalonDock.Layout public abstract bool IsValid { get; } + public XmlSchema GetSchema() + { + return null; + } + public abstract void ReadXml( XmlReader reader ); + public virtual void WriteXml( XmlWriter writer ) + { + foreach( var child in Children ) + { + var type = child.GetType(); + var serializer = new XmlSerializer( type ); + serializer.Serialize( writer, child ); + } + } - } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs index fa05d8ea..8257d7f3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs @@ -80,6 +80,34 @@ namespace Xceed.Wpf.AvalonDock.Layout } + #region AllowDuplicateContent + + private bool _allowDuplicateContent = true; + /// + /// Gets or sets the AllowDuplicateContent property. + /// When this property is true, then the LayoutDocumentPane or LayoutAnchorablePane allows dropping + /// duplicate content (according to its Title and ContentId). When this dependency property is false, + /// then the LayoutDocumentPane or LayoutAnchorablePane hides the OverlayWindow.DropInto button to prevent dropping of duplicate content. + /// + public bool AllowDuplicateContent + { + get + { + return _allowDuplicateContent; + } + set + { + if( _allowDuplicateContent != value ) + { + RaisePropertyChanging( "AllowDuplicateContent" ); + _allowDuplicateContent = value; + RaisePropertyChanged( "AllowDuplicateContent" ); + } + } + } + + #endregion + #region CanRepositionItems private bool _canRepositionItems = true; @@ -102,7 +130,6 @@ namespace Xceed.Wpf.AvalonDock.Layout #endregion - #region DockMinWidth private double _dockMinWidth = 25.0; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs index 63ed07f0..d55bf630 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs @@ -23,12 +23,14 @@ using System.Collections.ObjectModel; using System.Windows.Markup; using System.Xml.Serialization; using Standard; +using System.Xml; +using System.Xml.Schema; namespace Xceed.Wpf.AvalonDock.Layout { [ContentProperty("RootPanel")] [Serializable] - public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot + public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot, IXmlSerializable { public LayoutRoot() { @@ -660,7 +662,289 @@ namespace Xceed.Wpf.AvalonDock.Layout public event EventHandler ElementRemoved; - #endregion + #endregion + + public XmlSchema GetSchema() + { + return null; + } + + public void ReadXml( XmlReader reader ) + { + reader.MoveToContent(); + if( reader.IsEmptyElement ) + { + reader.Read(); + return; + } + + var layoutPanelElements = ReadRootPanel( reader ); + if( layoutPanelElements != null ) + { + //Create the RootPanel with the first child + RootPanel = new LayoutPanel( layoutPanelElements.First() ); + //Add all children to RootPanel + for( int i = 1; i < layoutPanelElements.Count; ++i ) + { + RootPanel.Children.Add( layoutPanelElements[ i ] ); + } + } + + TopSide = ( LayoutAnchorSide )ReadElement( reader ); + if( TopSide != null ) + { + TopSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) ); + reader.Read(); + } + RightSide = ( LayoutAnchorSide )ReadElement( reader ); + if( RightSide != null ) + { + RightSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) ); + reader.Read(); + } + LeftSide = ( LayoutAnchorSide )ReadElement( reader ); + if( LeftSide != null ) + { + LeftSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) ); + reader.Read(); + } + BottomSide = ( LayoutAnchorSide )ReadElement( reader ); + if( BottomSide != null ) + { + BottomSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) ); + reader.Read(); + } + + FloatingWindows.Clear(); + var floatingWindows = ReadElementList( reader ); + foreach( var floatingWindow in floatingWindows ) + { + FloatingWindows.Add( ( LayoutFloatingWindow )floatingWindow ); + } + + Hidden.Clear(); + var hidden = ReadElementList( reader ); + foreach( var hiddenObject in hidden ) + { + Hidden.Add( ( LayoutAnchorable )hiddenObject ); + } + } + + private List ReadRootPanel( XmlReader reader ) + { + var result = new List(); + + var startElementName = reader.LocalName; + reader.Read(); + if( reader.LocalName.Equals(startElementName) && (reader.NodeType == XmlNodeType.EndElement) ) + { + return null; + } + + while( reader.NodeType == XmlNodeType.Whitespace ) + { + reader.Read(); + } + + if( reader.LocalName.Equals("RootPanel")) + { + reader.Read(); + + while( true ) + { + //Read all RootPanel children + var element = ReadElement( reader ) as ILayoutPanelElement; + if( element != null ) + { + result.Add( element ); + } + else if( reader.NodeType == XmlNodeType.EndElement ) + { + break; + } + } + } + + reader.ReadEndElement(); + + return result; + } + + private List ReadElementList( XmlReader reader ) + { + var resultList = new List(); + + if( reader.IsEmptyElement ) + { + reader.Read(); + return resultList; + } + + var startElementName = reader.LocalName; + reader.Read(); + if( reader.LocalName.Equals(startElementName) && (reader.NodeType == XmlNodeType.EndElement) ) + { + return null; + } + + while( reader.NodeType == XmlNodeType.Whitespace ) + { + reader.Read(); + } + + while( true ) + { + var result = ReadElement( reader ) as LayoutFloatingWindow; + if( result == null ) + { + break; + } + + resultList.Add( result ); + } + + reader.ReadEndElement(); + + return resultList; + } + + private object ReadElement( XmlReader reader ) + { + if( reader.NodeType == XmlNodeType.EndElement ) + { + return null; + } + + while( reader.NodeType == XmlNodeType.Whitespace ) + { + reader.Read(); + } + + XmlSerializer serializer; + switch( reader.LocalName ) + { + case "LayoutAnchorablePaneGroup": + serializer = new XmlSerializer( typeof( LayoutAnchorablePaneGroup ) ); + break; + case "LayoutAnchorablePane": + serializer = new XmlSerializer( typeof( LayoutAnchorablePane ) ); + break; + case "LayoutAnchorable": + serializer = new XmlSerializer( typeof( LayoutAnchorable ) ); + break; + case "LayoutDocumentPaneGroup": + serializer = new XmlSerializer( typeof( LayoutDocumentPaneGroup ) ); + break; + case "LayoutDocumentPane": + serializer = new XmlSerializer( typeof( LayoutDocumentPane ) ); + break; + case "LayoutDocument": + serializer = new XmlSerializer( typeof( LayoutDocument ) ); + break; + case "LayoutAnchorGroup": + serializer = new XmlSerializer( typeof( LayoutAnchorGroup ) ); + break; + case "LayoutPanel": + serializer = new XmlSerializer( typeof( LayoutPanel ) ); + break; + case "LayoutDocumentFloatingWindow": + serializer = new XmlSerializer( typeof( LayoutDocumentFloatingWindow ) ); + break; + case "LayoutAnchorableFloatingWindow": + serializer = new XmlSerializer( typeof( LayoutAnchorableFloatingWindow ) ); + break; + case "LeftSide": + case "RightSide": + case "TopSide": + case "BottomSide": + if( reader.IsEmptyElement ) + { + reader.Read(); + return null; + } + reader.Read(); + return new LayoutAnchorSide(); + default: + var type = LayoutRoot.FindType( reader.LocalName ); + if( type == null ) + { + throw new ArgumentException( "AvalonDock.LayoutRoot doesn't know how to deserialize " + reader.LocalName ); + } + serializer = new XmlSerializer( type ); + break; + } + + return serializer.Deserialize( reader ); + } + + public void WriteXml( XmlWriter writer ) + { + writer.WriteStartElement( "RootPanel" ); + if( RootPanel != null ) + { + RootPanel.WriteXml( writer ); + } + writer.WriteEndElement(); + + writer.WriteStartElement( "TopSide" ); + if( TopSide != null ) + { + TopSide.WriteXml( writer ); + } + writer.WriteEndElement(); + + writer.WriteStartElement( "RightSide" ); + if( RightSide != null ) + { + RightSide.WriteXml( writer ); + } + writer.WriteEndElement(); + + writer.WriteStartElement( "LeftSide" ); + if( LeftSide != null ) + { + LeftSide.WriteXml( writer ); + } + writer.WriteEndElement(); + + writer.WriteStartElement( "BottomSide" ); + if( BottomSide != null ) + { + BottomSide.WriteXml( writer ); + } + writer.WriteEndElement(); + + // Write all floating windows (can be LayoutDocumentFloatingWindow or LayoutAnchorableFloatingWindow). + // To prevent "can not create instance of abstract type", the type is retrieved with GetType().Name + writer.WriteStartElement( "FloatingWindows" ); + foreach( var layoutFloatingWindow in FloatingWindows ) + { + writer.WriteStartElement( layoutFloatingWindow.GetType().Name ); + layoutFloatingWindow.WriteXml( writer ); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + + writer.WriteStartElement( "Hidden" ); + foreach( var layoutAnchorable in Hidden ) + { + layoutAnchorable.WriteXml( writer ); + } + writer.WriteEndElement(); + } + + internal static Type FindType( string name ) + { + foreach( var assembly in AppDomain.CurrentDomain.GetAssemblies() ) + { + foreach( var type in assembly.GetTypes() ) + { + if( type.Name.Equals( name ) ) + return type; + } + } + return null; + } #if TRACE public override void ConsoleDump(int tab) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs index 1b8da72b..4e14f82d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs @@ -24,6 +24,10 @@ namespace Xceed.Wpf.AvalonDock.Themes { public abstract class DictionaryTheme : Theme { + public DictionaryTheme() + { + } + public DictionaryTheme( ResourceDictionary themeResourceDictionary ) { this.ThemeResourceDictionary = themeResourceDictionary; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs index 42f3494f..86729f0c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs @@ -19,7 +19,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "3.1"; + public const string BaseVersion = "3.2"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CheckBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CheckBox.cs index 135783f2..bf6b17ca 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CheckBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CheckBox.cs @@ -80,13 +80,6 @@ namespace Xceed.Wpf.DataGrid #endregion IsThreeState Property - public override void OnApplyTemplate() - { - base.OnApplyTemplate(); - - ChildCheckBox.Background = new System.Windows.Media.SolidColorBrush( System.Windows.Media.Colors.Blue ); - } - public static readonly RoutedEvent CheckedEvent; public static readonly RoutedEvent UncheckedEvent; public static readonly RoutedEvent IndeterminateEvent; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt index 6ceeb819..3c6b85f9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt @@ -100,7 +100,7 @@ + Content="ShowTabHeaders" + IsChecked="{Binding ElementName=_colorPicker, Path=ShowTabHeaders, Mode=TwoWay}" /> + /// Interaction logic for IconButtonView.xaml + /// + public partial class IconButtonView : DemoView + { + public IconButtonView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt new file mode 100644 index 00000000..a75428cd --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt @@ -0,0 +1,180 @@ + + + + + + The IconButton control is a Button that contains an icon and some data. The Foreground, Background and BorderBrush can be easily modified with properties while the Icon location is customizable. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt new file mode 100644 index 00000000..2bee2ede --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt @@ -0,0 +1,111 @@ +/************************************************************************************** + + Toolkit for WPF + + Copyright (C) 2007-2016 Xceed Software Inc. + + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license + + For more features, controls, and fast professional support, + pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + + **************************************************************************************/ +using System.Diagnostics; +using System.Windows; +using System.Windows.Controls; + +namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views +{ + /// + /// Interaction logic for MaterialHamburgerView.xaml + /// + public partial class MaterialHamburgerView : MaterialDemoView + { + #region Constructors + + public MaterialHamburgerView() + { + InitializeComponent(); + } + + #endregion + +#if !OPEN_SOURCE + + #region EventHandlers + + private void CheckedContentComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e ) + { + if( materialHamburger == null ) + return; + + if( ( e.AddedItems != null ) && ( e.AddedItems.Count > 0 ) ) + { + var selection = e.AddedItems[ 0 ] as ComboBoxItem; + if( selection != null ) + { + if( selection.Tag != null ) + { + materialHamburger.CheckedContent = selection.Tag; + } + else + { + materialHamburger.ClearValue( MaterialHamburger.CheckedContentProperty ); + } + } + } + } + + private void UncheckedContentComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e ) + { + if( materialHamburger == null ) + return; + + if( ( e.AddedItems != null ) && ( e.AddedItems.Count > 0 ) ) + { + var selection = e.AddedItems[ 0 ] as ComboBoxItem; + if( selection != null ) + { + if( selection.Tag != null ) + { + materialHamburger.UncheckedContent = selection.Tag; + } + else + { + materialHamburger.ClearValue( MaterialHamburger.UncheckedContentProperty ); + } + } + } + } + + private void MenuLocationComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e ) + { + if( ( e.AddedItems != null ) && ( e.AddedItems.Count > 0 ) ) + { + var menuLocation = ( HamburgerLocation )e.AddedItems[ 0 ]; + materialHamburgerMenu.CloseButtonLocation = ( menuLocation == HamburgerLocation.Right ) ? Location.Left : Location.Right; + } + } + + private void IconButton_Click( object sender, RoutedEventArgs e ) + { + var button = sender as IconButton; + if( button != null ) + { + Process.Start( new ProcessStartInfo( button.Tag as string ) ); + } + } + + private void ApplyButton_Click( object sender, RoutedEventArgs e ) + { + materialHamburger.IsChecked = false; + } + + #endregion + +#endif + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt new file mode 100644 index 00000000..1e8ac673 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt @@ -0,0 +1,610 @@ + + + + + + A ToggleButton that pops a menu from left, right, top or bottom of a Window (or any FrameworkElement). The menu can be an animated HamburgerMenu or any customized content. It uses the Material Brushes. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml index ca31497a..36d5610c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml @@ -25,1324 +25,1361 @@ xmlns:commands="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Commands" xmlns:sys="clr-namespace:System;assembly=mscorlib"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs index 67c076d9..3e58a8dc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs @@ -1054,7 +1054,7 @@ namespace Xceed.Wpf.Toolkit private void LowerSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs e ) { - if( _lowerSlider.IsLoaded ) + if( (_lowerSlider != null) && _lowerSlider.IsLoaded ) { if( !this.IsDeferredUpdateValues ) { @@ -1069,7 +1069,7 @@ namespace Xceed.Wpf.Toolkit private void HigherSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs e ) { - if( _higherSlider.IsLoaded ) + if( ( _higherSlider != null) && _higherSlider.IsLoaded ) { if( !this.IsDeferredUpdateValues ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs index 397d5415..c710bbe6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs @@ -113,7 +113,7 @@ namespace Xceed.Wpf.Toolkit private void Bullets_Clicked( object sender, RoutedEventArgs e ) { - if( BothSelectionListsAreChecked() ) + if( BothSelectionListsAreChecked() && ( _btnNumbers != null) ) { _btnNumbers.IsChecked = false; } @@ -121,7 +121,7 @@ namespace Xceed.Wpf.Toolkit private void Numbers_Clicked( object sender, RoutedEventArgs e ) { - if( BothSelectionListsAreChecked() ) + if( BothSelectionListsAreChecked() && ( _btnBullets != null) ) { _btnBullets.IsChecked = false; } @@ -265,9 +265,12 @@ namespace Xceed.Wpf.Toolkit if( currentValue == DependencyProperty.UnsetValue ) return; - button.IsChecked = ( currentValue == null ) - ? false - : currentValue != null && currentValue.Equals( expectedValue ); + if( button != null ) + { + button.IsChecked = ( currentValue == null ) + ? false + : currentValue != null && currentValue.Equals( expectedValue ); + } } private void UpdateSelectedFontFamily() @@ -282,7 +285,7 @@ namespace Xceed.Wpf.Toolkit return; FontFamily currentFontFamily = ( FontFamily )value; - if( currentFontFamily != null ) + if( (currentFontFamily != null) && ( _cmbFontFamilies != null) ) { _cmbFontFamilies.SelectedItem = currentFontFamily; } @@ -299,7 +302,10 @@ namespace Xceed.Wpf.Toolkit if( value == DependencyProperty.UnsetValue ) return; - _cmbFontSizes.SelectedValue = value; + if( _cmbFontSizes != null ) + { + _cmbFontSizes.SelectedValue = value; + } } private void UpdateFontColor() @@ -316,7 +322,10 @@ namespace Xceed.Wpf.Toolkit Color? currentColor = ( ( value == null ) ? null : ( Color? )( ( SolidColorBrush )value ).Color ); - _cmbFontColor.SelectedColor = currentColor; + if( _cmbFontColor != null ) + { + _cmbFontColor.SelectedColor = currentColor; + } } private void UpdateFontBackgroundColor() @@ -333,7 +342,10 @@ namespace Xceed.Wpf.Toolkit Color? currentColor = ( ( value == null ) ? null : ( Color? )( ( SolidColorBrush )value ).Color ); - _cmbFontBackgroundColor.SelectedColor = currentColor; + if( _cmbFontBackgroundColor != null ) + { + _cmbFontBackgroundColor.SelectedColor = currentColor; + } } /// @@ -341,6 +353,9 @@ namespace Xceed.Wpf.Toolkit /// private void UpdateSelectionListType() { + if( (_btnNumbers == null) || ( _btnBullets == null) ) + return; + //uncheck both _btnBullets.IsChecked = false; _btnNumbers.IsChecked = false; @@ -371,7 +386,8 @@ namespace Xceed.Wpf.Toolkit /// private bool BothSelectionListsAreChecked() { - return _btnBullets.IsChecked == true && _btnNumbers.IsChecked == true; + return (( _btnBullets != null) && (_btnBullets.IsChecked == true) ) + && (( _btnNumbers != null) && (_btnNumbers.IsChecked == true)); } void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value ) @@ -427,8 +443,11 @@ namespace Xceed.Wpf.Toolkit { get { - return ( _cmbFontFamilies.IsDropDownOpen || _cmbFontSizes.IsDropDownOpen || - _cmbFontBackgroundColor.IsOpen || _cmbFontColor.IsOpen || _waitingForMouseOver ); + return ( (( _cmbFontFamilies != null) && _cmbFontFamilies.IsDropDownOpen) + || (( _cmbFontSizes != null) && _cmbFontSizes.IsDropDownOpen) + || (( _cmbFontBackgroundColor != null) && _cmbFontBackgroundColor.IsOpen) + || (( _cmbFontColor != null) && _cmbFontColor.IsOpen) + || _waitingForMouseOver ); } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs index 53a6c0f0..1b3c53d9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs @@ -204,31 +204,31 @@ namespace Xceed.Wpf.Toolkit { Point mousePosition = Mouse.GetPosition( _richTextBox ); - double left = mousePosition.X; - double top = ( mousePosition.Y - 15 ) - adorningEditor.ActualHeight; + var left = mousePosition.X; + var top = mousePosition.Y; - //top + // Top boundary if( top < 0 ) { - top = Math.Max( mousePosition.Y + 10, 5 ); + top = 5d; } - - // bottom - if ( top + adorningEditor.ActualHeight > _richTextBox.ActualHeight - 20 ) + + // Left boundary + if( left < 0 ) { - top = _richTextBox.ActualHeight - adorningEditor.ActualHeight - 20; + left = 5d; } - // left boundary - if ( left < 0 ) + // Right boundary + if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 10d ) { - left = 5; + left = _richTextBox.ActualWidth - adorningEditor.ActualWidth - 10d; } - //right boundary - if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20 ) + // Bottom boundary + if( top + adorningEditor.ActualHeight > _richTextBox.ActualHeight - 10d ) { - left = _richTextBox.ActualWidth - adorningEditor.ActualWidth - 20; + top = _richTextBox.ActualHeight - adorningEditor.ActualHeight - 10d; } _adorner.SetOffsets( left, top ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml index d97f65d1..e9ff8926 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml @@ -40,6 +40,7 @@ + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml index 2674d29e..0477349a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml @@ -39,6 +39,7 @@ + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs index 1ce7e195..9e82d3a5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs @@ -222,6 +222,24 @@ namespace Xceed.Wpf.Toolkit TimeSpan current = this.Value.HasValue ? this.Value.Value : new TimeSpan(); TimeSpan result; var success = TimeSpan.TryParse( currentValue, out result ); + if( !success ) + { + // Validate when more than 60 seconds (or more than 60 minutes, or more than 24 hours) are entered. + var separators = currentValue.Where( x => x == ':' || x == '.' ).ToList(); + var values = currentValue.Split( new char[] { ':', '.' } ); + if( values.Count() >= 2 ) + { + bool haveDays = separators.First() == '.'; + bool haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' ); + + result = new TimeSpan( haveDays ? int.Parse( values[ 0 ] ) : 0, //Days + haveDays ? int.Parse( values[ 1 ] ) : int.Parse( values[ 0 ] ), //Hours + haveDays ? int.Parse( values[ 2 ] ) : int.Parse( values[ 1 ] ), //Minutes + (haveDays && this.ShowSeconds) ? int.Parse( values[ 3 ] ) : this.ShowSeconds ? int.Parse( values[ 2 ] ) : 0, //Seconds + haveMS ? int.Parse( values.Last() ) : 0 ); //Milliseconds + } + } + currentValue = result.ToString(); // When text is typed, if UpdateValueOnEnterKey is true, diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs index 1b15b161..5cae21ae 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs @@ -27,25 +27,6 @@ namespace Xceed.Wpf.Toolkit { #region Properties - #region SelectAllOnGotFocus (Obsolete) - - [Obsolete( "This property is obsolete and should no longer be used. Use AutoSelectTextBox.AutoSelectBehavior instead." )] - public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new PropertyMetadata( false ) ); - [Obsolete( "This property is obsolete and should no longer be used. Use AutoSelectTextBox.AutoSelectBehavior instead." )] - public bool SelectAllOnGotFocus - { - get - { - return ( bool )GetValue( SelectAllOnGotFocusProperty ); - } - set - { - SetValue( SelectAllOnGotFocusProperty, value ); - } - } - - #endregion //SelectAllOnGotFocus - #region KeepWatermarkOnGotFocus public static readonly DependencyProperty KeepWatermarkOnGotFocusProperty = DependencyProperty.Register( "KeepWatermarkOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new UIPropertyMetadata( false ) ); @@ -107,29 +88,6 @@ namespace Xceed.Wpf.Toolkit } #endregion //Constructors - - #region Base Class Overrides - - protected override void OnGotFocus( RoutedEventArgs e ) - { - base.OnGotFocus( e ); - - if( SelectAllOnGotFocus ) - SelectAll(); - } - - protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e ) - { - if( !IsKeyboardFocused && SelectAllOnGotFocus ) - { - e.Handled = true; - Focus(); - } - - base.OnPreviewMouseLeftButtonDown( e ); //Focus AutoSelectTextBox and eat the event - } - - #endregion //Base Class Overrides } #pragma warning restore 0618 diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj index 13bba0ae..924509db 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj @@ -62,6 +62,14 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -383,6 +391,10 @@ + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs index c086aa25..3e2bf0ca 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs @@ -41,6 +41,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox { private const string PART_VerticalScrollBar = "PART_VerticalScrollBar"; private const string PART_HorizontalScrollBar = "PART_HorizontalScrollBar"; + private bool _isUpdatingVisualTree = false; #region Constructors @@ -859,7 +860,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox private static readonly DependencyPropertyKey ViewFinderPropertyKey = DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ), - new FrameworkPropertyMetadata( null ) ); + new FrameworkPropertyMetadata( null, new PropertyChangedCallback( Zoombox.OnViewFinderChanged ) ) ); public static readonly DependencyProperty ViewFinderProperty = Zoombox.ViewFinderPropertyKey.DependencyProperty; @@ -869,6 +870,20 @@ namespace Xceed.Wpf.Toolkit.Zoombox { return ( FrameworkElement )this.GetValue( Zoombox.ViewFinderProperty ); } + set + { + this.SetValue( Zoombox.ViewFinderPropertyKey, value ); + } + } + + private static void OnViewFinderChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) + { + ( ( Zoombox )d ).OnViewFinderChanged( e ); + } + + private void OnViewFinderChanged( DependencyPropertyChangedEventArgs e ) + { + this.AttachToVisualTree(); } #endregion @@ -2038,6 +2053,11 @@ namespace Xceed.Wpf.Toolkit.Zoombox private void AttachToVisualTree() { + if( _isUpdatingVisualTree ) + return; + + _isUpdatingVisualTree = true; + // detach from the old tree this.DetachFromVisualTree(); @@ -2067,24 +2087,12 @@ namespace Xceed.Wpf.Toolkit.Zoombox if( _contentPresenter == null ) throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxTemplateNeedsContent" ) ); - //locate the vertical scrollBar - if( _verticalScrollBar != null ) - { - _verticalScrollBar.Scroll -= this.VerticalScrollBar_Scroll; - } - _verticalScrollBar = this.GetTemplateChild( PART_VerticalScrollBar ) as ScrollBar; if( _verticalScrollBar == null ) throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox vertical scrollBar not found." ) ); _verticalScrollBar.Scroll += this.VerticalScrollBar_Scroll; - //locate the horizontal scrollBar - if( _horizontalScrollBar != null ) - { - _horizontalScrollBar.Scroll -= this.HorizontalScrollBar_Scroll; - } - _horizontalScrollBar = this.GetTemplateChild( PART_HorizontalScrollBar ) as ScrollBar; if( _horizontalScrollBar == null ) throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox horizontal scrollBar not found." ) ); @@ -2120,11 +2128,24 @@ namespace Xceed.Wpf.Toolkit.Zoombox // If we don't do the following, the content is not laid out correctly (centered) initially. VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true ); - // set a reference to the ViewFinder element, if present - this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement ); + // User has not defined a ViewFinder, use the one from this template + if( this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null ) + { + // set a reference to the ViewFinder element, if present + this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement ); + Zoombox.SetViewFinderVisibility( this, Visibility.Collapsed ); + } + else + { + //user has defined a ViewFinder, hide the one from this template + Zoombox.SetViewFinderVisibility( this, Visibility.Hidden ); + } // locate the view finder display panel - _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay; + if( this.ViewFinder != null ) + { + _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this.ViewFinder, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay; + } // if a ViewFinder was specified but no display panel is present, throw an exception if( this.ViewFinder != null && _viewFinderDisplay == null ) @@ -2149,8 +2170,12 @@ namespace Xceed.Wpf.Toolkit.Zoombox _viewFinderDisplay.SetBinding( ZoomboxViewFinderDisplay.ViewportRectProperty, binding ); } + this.UpdateViewFinderDisplayContentBounds(); + // set up event handler to run once the content presenter has been arranged _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged ); + + _isUpdatingVisualTree = false; } private void CreateVisualBrushForViewFinder( Visual visual ) @@ -2244,12 +2269,14 @@ namespace Xceed.Wpf.Toolkit.Zoombox { IsAnimated = oldAnimated; } + //When ViewFinder is modified, this will refresh the ZoomboxViewFinderDisplay + this.ZoomTo( this.Scale ); } private void DetachFromVisualTree() { // remove the drag adorner - if( _dragAdorner != null ) + if( (_dragAdorner != null) && ( AdornerLayer.GetAdornerLayer( this ) != null ) ) AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner ); // remove the layout updated handler, if present @@ -2258,9 +2285,25 @@ namespace Xceed.Wpf.Toolkit.Zoombox _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged ); } + //locate the vertical scrollBar + if( _verticalScrollBar != null ) + { + _verticalScrollBar.Scroll -= this.VerticalScrollBar_Scroll; + } + + //locate the horizontal scrollBar + if( _horizontalScrollBar != null ) + { + _horizontalScrollBar.Scroll -= this.HorizontalScrollBar_Scroll; + } + // remove the view finder display panel's visual brush and adorner if( _viewFinderDisplay != null ) { + _viewFinderDisplay.MouseMove -= new MouseEventHandler( this.ViewFinderDisplayMouseMove ); + _viewFinderDisplay.MouseLeftButtonDown -= new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture ); + _viewFinderDisplay.MouseLeftButtonUp -= new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture ); + BindingOperations.ClearBinding( _viewFinderDisplay, ZoomboxViewFinderDisplay.ViewportRectProperty ); _viewFinderDisplay = null; } @@ -2275,8 +2318,18 @@ namespace Xceed.Wpf.Toolkit.Zoombox private void VerticalScrollBar_Scroll( object sender, ScrollEventArgs e ) { - double diff = e.NewValue + _relativePosition.Y; - this.OnDrag( new DragDeltaEventArgs( 0d, -diff / this.Scale ), false ); + double diff = -(e.NewValue + _relativePosition.Y); + + if( e.ScrollEventType == ScrollEventType.LargeIncrement ) + { + diff = -_verticalScrollBar.ViewportSize; + } + else if( e.ScrollEventType == ScrollEventType.LargeDecrement ) + { + diff = _verticalScrollBar.ViewportSize; + } + + this.OnDrag( new DragDeltaEventArgs( 0d, diff / this.Scale ), false ); // Raise the Scroll event to user EventHandler handler = this.Scroll; @@ -2288,8 +2341,17 @@ namespace Xceed.Wpf.Toolkit.Zoombox private void HorizontalScrollBar_Scroll( object sender, ScrollEventArgs e ) { - double diff = e.NewValue + _relativePosition.X; - this.OnDrag( new DragDeltaEventArgs( -diff / this.Scale, 0d ), false ); + double diff = -( e.NewValue + _relativePosition.X ); + if( e.ScrollEventType == ScrollEventType.LargeIncrement ) + { + diff = -_horizontalScrollBar.ViewportSize; + } + else if( e.ScrollEventType == ScrollEventType.LargeDecrement ) + { + diff = _horizontalScrollBar.ViewportSize; + } + + this.OnDrag( new DragDeltaEventArgs( diff / this.Scale, 0d ), false ); // Raise the Scroll event to user EventHandler handler = this.Scroll; @@ -2439,6 +2501,11 @@ namespace Xceed.Wpf.Toolkit.Zoombox Point relativePosition = _relativePosition; double scale = this.Scale; Point newPosition = relativePosition + ( this.ContentOffset * scale ) + new Vector( e.HorizontalChange * scale, e.VerticalChange * scale ); + if( this.IsUsingScrollBars ) + { + newPosition.X = Math.Max( Math.Min( newPosition.X, 0d ), -_horizontalScrollBar.Maximum ); + newPosition.Y = Math.Max( Math.Min( newPosition.Y, 0d ), -_verticalScrollBar.Maximum ); + } // update the transform this.UpdateView( new ZoomboxView( scale, newPosition ), false, end ); diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs index d0386451..5187d3fa 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "3.1"; + public const string BaseVersion = "3.2"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs index a81e4779..a6800826 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs @@ -250,7 +250,7 @@ namespace Xceed.Wpf.Toolkit { if( this.AllowSpin ) { - this.OnSpin( new SpinEventArgs( SpinDirection.Increase ) ); + this.OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, SpinDirection.Increase ) ); e.Handled = true; } @@ -260,7 +260,7 @@ namespace Xceed.Wpf.Toolkit { if( this.AllowSpin ) { - this.OnSpin( new SpinEventArgs( SpinDirection.Decrease ) ); + this.OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, SpinDirection.Decrease ) ); e.Handled = true; } @@ -269,7 +269,8 @@ namespace Xceed.Wpf.Toolkit case Key.Enter: { //Do not Spin on enter Key when spinners have focus - if( this.IncreaseButton.IsFocused || this.DecreaseButton.IsFocused ) + if( ((this.IncreaseButton != null) && (this.IncreaseButton.IsFocused)) + || (( this.DecreaseButton != null ) && this.DecreaseButton.IsFocused )) { e.Handled = true; } @@ -282,18 +283,14 @@ namespace Xceed.Wpf.Toolkit { base.OnMouseWheel( e ); - if( this.IsKeyboardFocusWithin && !e.Handled && this.AllowSpin ) + if( !e.Handled && this.AllowSpin ) { - if( e.Delta < 0 ) + if( e.Delta != 0 ) { - this.OnSpin( new SpinEventArgs( SpinDirection.Decrease, true ) ); + var spinnerEventArgs = new SpinEventArgs( Spinner.SpinnerSpinEvent, ( e.Delta < 0 ) ? SpinDirection.Decrease : SpinDirection.Increase, true ); + this.OnSpin( spinnerEventArgs ); + e.Handled = spinnerEventArgs.Handled; } - else if( 0 < e.Delta ) - { - this.OnSpin( new SpinEventArgs( SpinDirection.Increase, true ) ); - } - - e.Handled = true; } } @@ -322,7 +319,7 @@ namespace Xceed.Wpf.Toolkit if( AllowSpin ) { SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease; - OnSpin( new SpinEventArgs( direction ) ); + OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, direction ) ); } } diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs index fe94ec64..a9b30b08 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs @@ -53,11 +53,24 @@ namespace Xceed.Wpf.Toolkit Direction = direction; } + public SpinEventArgs( RoutedEvent routedEvent, SpinDirection direction ) + : base( routedEvent ) + { + Direction = direction; + } + public SpinEventArgs( SpinDirection direction, bool usingMouseWheel ) : base() { Direction = direction; UsingMouseWheel = usingMouseWheel; } + + public SpinEventArgs( RoutedEvent routedEvent, SpinDirection direction, bool usingMouseWheel ) + : base( routedEvent ) + { + Direction = direction; + UsingMouseWheel = usingMouseWheel; + } } } diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs index 0f1c9647..b71397d0 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs @@ -63,6 +63,24 @@ namespace Xceed.Wpf.Toolkit /// public event EventHandler Spin; + #region Events + + public static readonly RoutedEvent SpinnerSpinEvent = EventManager.RegisterRoutedEvent( "SpinnerSpin", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Spinner ) ); + + public event RoutedEventHandler SpinnerSpin + { + add + { + AddHandler( SpinnerSpinEvent, value ); + } + remove + { + RemoveHandler( SpinnerSpinEvent, value ); + } + } + + #endregion + /// /// Initializes a new instance of the Spinner class. /// diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs index 61cc813e..2ff8f6e9 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs @@ -179,15 +179,18 @@ namespace Xceed.Wpf.Toolkit private void OnCalculatorValueChanged( object sender, RoutedPropertyChangedEventArgs e ) { - if( IsValid( _calculator.Value ) ) + if( _calculator != null ) { - if( this.UpdateValueOnEnterKey ) - { - this.TextBox.Text = (_calculator.Value != null) ? _calculator.Value.Value.ToString( this.FormatString, this.CultureInfo ) : null; - } - else + if( IsValid( _calculator.Value ) ) { - this.Value = _calculator.Value; + if( this.UpdateValueOnEnterKey ) + { + this.TextBox.Text = ( _calculator.Value != null ) ? _calculator.Value.Value.ToString( this.FormatString, this.CultureInfo ) : null; + } + else + { + this.Value = _calculator.Value; + } } } } diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml index 42d77eaf..8c374919 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml @@ -123,7 +123,6 @@ MinWidth="20" AcceptsReturn="False" Padding="{TemplateBinding Padding}" - SelectAllOnGotFocus="{TemplateBinding SelectAllOnGotFocus}" AutoSelectBehavior="{TemplateBinding AutoSelectBehavior}" AutoMoveFocus="{TemplateBinding AutoMoveFocus}" TextAlignment="{TemplateBinding TextAlignment}" diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml index 44f6705d..2bed476b 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml @@ -137,7 +137,6 @@ MinWidth="20" AcceptsReturn="False" Padding="{TemplateBinding Padding}" - SelectAllOnGotFocus="{TemplateBinding SelectAllOnGotFocus}" AutoSelectBehavior="{TemplateBinding AutoSelectBehavior}" AutoMoveFocus="{TemplateBinding AutoMoveFocus}" TextAlignment="{TemplateBinding TextAlignment}" diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml index 2316da7e..bff06a32 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml @@ -91,7 +91,7 @@ Value="false"> + Value="#AFAFAF" /> diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml index c1e52234..d1f499f6 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml @@ -20,105 +20,158 @@ xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"> - - - - - + + + + + diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs index d3a010b2..15419297 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs @@ -393,25 +393,34 @@ namespace Xceed.Wpf.Toolkit void ColorShadingCanvas_MouseLeftButtonDown( object sender, MouseButtonEventArgs e ) { - Point p = e.GetPosition( _colorShadingCanvas ); - UpdateColorShadeSelectorPositionAndCalculateColor( p, true ); - _colorShadingCanvas.CaptureMouse(); - //Prevent from closing ColorCanvas after mouseDown in ListView - e.Handled = true; + if( _colorShadingCanvas != null ) + { + Point p = e.GetPosition( _colorShadingCanvas ); + UpdateColorShadeSelectorPositionAndCalculateColor( p, true ); + _colorShadingCanvas.CaptureMouse(); + //Prevent from closing ColorCanvas after mouseDown in ListView + e.Handled = true; + } } void ColorShadingCanvas_MouseLeftButtonUp( object sender, MouseButtonEventArgs e ) { - _colorShadingCanvas.ReleaseMouseCapture(); + if( _colorShadingCanvas != null ) + { + _colorShadingCanvas.ReleaseMouseCapture(); + } } void ColorShadingCanvas_MouseMove( object sender, MouseEventArgs e ) { - if( e.LeftButton == MouseButtonState.Pressed ) + if( _colorShadingCanvas != null ) { - Point p = e.GetPosition( _colorShadingCanvas ); - UpdateColorShadeSelectorPositionAndCalculateColor( p, true ); - Mouse.Synchronize(); + if( e.LeftButton == MouseButtonState.Pressed ) + { + Point p = e.GetPosition( _colorShadingCanvas ); + UpdateColorShadeSelectorPositionAndCalculateColor( p, true ); + Mouse.Synchronize(); + } } } @@ -493,7 +502,10 @@ namespace Xceed.Wpf.Toolkit private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool calculateColor ) { - if( p.Y < 0 ) + if( (_colorShadingCanvas == null) || ( _colorShadeSelector == null) ) + return; + + if( p.Y < 0 ) p.Y = 0; if( p.X < 0 ) @@ -541,6 +553,9 @@ namespace Xceed.Wpf.Toolkit private void CalculateColor( Point p ) { + if( _spectrumSlider == null ) + return; + HsvColor hsv = new HsvColor( 360 - _spectrumSlider.Value, 1, 1 ) { S = p.X, diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs index fe4ba30d..fb0eb3d9 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs @@ -103,7 +103,10 @@ namespace Xceed.Wpf.Toolkit } _pickerBrush.GradientStops[ i - 1 ].Offset = 1.0; - _spectrumDisplay.Fill = _pickerBrush; + if( _spectrumDisplay != null ) + { + _spectrumDisplay.Fill = _pickerBrush; + } } #endregion //Methods diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs index 760dade7..91b87ed6 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs @@ -45,7 +45,6 @@ namespace Xceed.Wpf.Toolkit [TemplatePart( Name = PART_RecentColors, Type = typeof( ListBox ) )] [TemplatePart( Name = PART_ColorPickerToggleButton, Type = typeof( ToggleButton ) )] [TemplatePart( Name = PART_ColorPickerPalettePopup, Type = typeof( Popup ) )] - [TemplatePart( Name = PART_ColorModeButton, Type = typeof( Button ) )] public class ColorPicker : Control { private const string PART_AvailableColors = "PART_AvailableColors"; @@ -53,7 +52,6 @@ namespace Xceed.Wpf.Toolkit private const string PART_RecentColors = "PART_RecentColors"; private const string PART_ColorPickerToggleButton = "PART_ColorPickerToggleButton"; private const string PART_ColorPickerPalettePopup = "PART_ColorPickerPalettePopup"; - private const string PART_ColorModeButton = "PART_ColorModeButton"; #region Members @@ -62,7 +60,6 @@ namespace Xceed.Wpf.Toolkit private ListBox _recentColors; private ToggleButton _toggleButton; private Popup _popup; - private Button _colorModeButton; private Color? _initialColor; private bool _selectionChanged; @@ -355,22 +352,22 @@ namespace Xceed.Wpf.Toolkit #endregion //SelectedColorText - #region ShowAdvancedButton + #region ShowTabHeaders - public static readonly DependencyProperty ShowAdvancedButtonProperty = DependencyProperty.Register( "ShowAdvancedButton", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) ); - public bool ShowAdvancedButton + public static readonly DependencyProperty ShowTabHeadersProperty = DependencyProperty.Register( "ShowTabHeaders", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) ); + public bool ShowTabHeaders { get { - return ( bool )GetValue( ShowAdvancedButtonProperty ); + return ( bool )GetValue( ShowTabHeadersProperty ); } set { - SetValue( ShowAdvancedButtonProperty, value ); + SetValue( ShowTabHeadersProperty, value ); } } - #endregion //ShowAdvancedButton + #endregion //ShowTabHeaders #region ShowAvailableColors @@ -578,14 +575,6 @@ namespace Xceed.Wpf.Toolkit _popup.Opened += Popup_Opened; _toggleButton = this.Template.FindName( PART_ColorPickerToggleButton, this ) as ToggleButton; - - if( _colorModeButton != null ) - _colorModeButton.Click -= new RoutedEventHandler( this.ColorModeButton_Clicked ); - - _colorModeButton = this.Template.FindName( PART_ColorModeButton, this ) as Button; - - if( _colorModeButton != null ) - _colorModeButton.Click += new RoutedEventHandler( this.ColorModeButton_Clicked ); } protected override void OnMouseUp( MouseButtonEventArgs e ) @@ -675,11 +664,6 @@ namespace Xceed.Wpf.Toolkit listBoxItem.Focus(); } - private void ColorModeButton_Clicked( object sender, RoutedEventArgs e ) - { - this.ColorMode = ( this.ColorMode == ColorMode.ColorPalette ) ? ColorMode.ColorCanvas : ColorMode.ColorPalette; - } - #endregion //Event Handlers #region Events @@ -769,35 +753,35 @@ namespace Xceed.Wpf.Toolkit private static ObservableCollection CreateStandardColors() { - ObservableCollection _standardColors = new ObservableCollection(); - _standardColors.Add( new ColorItem( Colors.Transparent, "Transparent" ) ); - _standardColors.Add( new ColorItem( Colors.White, "White" ) ); - _standardColors.Add( new ColorItem( Colors.Gray, "Gray" ) ); - _standardColors.Add( new ColorItem( Colors.Black, "Black" ) ); - _standardColors.Add( new ColorItem( Colors.Red, "Red" ) ); - _standardColors.Add( new ColorItem( Colors.Green, "Green" ) ); - _standardColors.Add( new ColorItem( Colors.Blue, "Blue" ) ); - _standardColors.Add( new ColorItem( Colors.Yellow, "Yellow" ) ); - _standardColors.Add( new ColorItem( Colors.Orange, "Orange" ) ); - _standardColors.Add( new ColorItem( Colors.Purple, "Purple" ) ); - return _standardColors; + ObservableCollection standardColors = new ObservableCollection(); + standardColors.Add( new ColorItem( Colors.Transparent, "Transparent" ) ); + standardColors.Add( new ColorItem( Colors.White, "White" ) ); + standardColors.Add( new ColorItem( Colors.Gray, "Gray" ) ); + standardColors.Add( new ColorItem( Colors.Black, "Black" ) ); + standardColors.Add( new ColorItem( Colors.Red, "Red" ) ); + standardColors.Add( new ColorItem( Colors.Green, "Green" ) ); + standardColors.Add( new ColorItem( Colors.Blue, "Blue" ) ); + standardColors.Add( new ColorItem( Colors.Yellow, "Yellow" ) ); + standardColors.Add( new ColorItem( Colors.Orange, "Orange" ) ); + standardColors.Add( new ColorItem( Colors.Purple, "Purple" ) ); + return standardColors; } private static ObservableCollection CreateAvailableColors() { - ObservableCollection _standardColors = new ObservableCollection(); + ObservableCollection standardColors = new ObservableCollection(); foreach( var item in ColorUtilities.KnownColors ) { if( !String.Equals( item.Key, "Transparent" ) ) { var colorItem = new ColorItem( item.Value, item.Key ); - if( !_standardColors.Contains( colorItem ) ) - _standardColors.Add( colorItem ); + if( !standardColors.Contains( colorItem ) ) + standardColors.Add( colorItem ); } } - return _standardColors; + return standardColors; } #endregion //Methods diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs new file mode 100644 index 00000000..370263a6 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs @@ -0,0 +1,43 @@ +/************************************************************************************* + + Extended WPF Toolkit + + Copyright (C) 2007-2013 Xceed Software Inc. + + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license + + For more features, controls, and fast professional support, + pick up the Plus Edition at http://xceed.com/wpf_toolkit + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + + ***********************************************************************************/ + +using System.Windows.Controls; +using System.Windows.Input; + +namespace Xceed.Wpf.Toolkit +{ + public class ColorPickerTabItem : TabItem + { + protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e ) + { + if( e.Source == this || !this.IsSelected ) + return; + + base.OnMouseLeftButtonDown( e ); + } + + protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e ) + { + //Selection on Mouse Up + if( e.Source == this || !this.IsSelected ) + { + base.OnMouseLeftButtonDown( e ); + } + + base.OnMouseLeftButtonUp( e ); + } + } +} diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml index b903cd20..65c81a93 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml @@ -31,6 +31,7 @@ + + + + + + + + + + + + + + + + + + + + @@ -311,103 +354,93 @@ Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3" > - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml index ca31497a..36d5610c 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml @@ -25,1324 +25,1361 @@ xmlns:commands="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Commands" xmlns:sys="clr-namespace:System;assembly=mscorlib"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs index 67c076d9..3e58a8dc 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs @@ -1054,7 +1054,7 @@ namespace Xceed.Wpf.Toolkit private void LowerSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs e ) { - if( _lowerSlider.IsLoaded ) + if( (_lowerSlider != null) && _lowerSlider.IsLoaded ) { if( !this.IsDeferredUpdateValues ) { @@ -1069,7 +1069,7 @@ namespace Xceed.Wpf.Toolkit private void HigherSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs e ) { - if( _higherSlider.IsLoaded ) + if( ( _higherSlider != null) && _higherSlider.IsLoaded ) { if( !this.IsDeferredUpdateValues ) { diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs index 397d5415..c710bbe6 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs @@ -113,7 +113,7 @@ namespace Xceed.Wpf.Toolkit private void Bullets_Clicked( object sender, RoutedEventArgs e ) { - if( BothSelectionListsAreChecked() ) + if( BothSelectionListsAreChecked() && ( _btnNumbers != null) ) { _btnNumbers.IsChecked = false; } @@ -121,7 +121,7 @@ namespace Xceed.Wpf.Toolkit private void Numbers_Clicked( object sender, RoutedEventArgs e ) { - if( BothSelectionListsAreChecked() ) + if( BothSelectionListsAreChecked() && ( _btnBullets != null) ) { _btnBullets.IsChecked = false; } @@ -265,9 +265,12 @@ namespace Xceed.Wpf.Toolkit if( currentValue == DependencyProperty.UnsetValue ) return; - button.IsChecked = ( currentValue == null ) - ? false - : currentValue != null && currentValue.Equals( expectedValue ); + if( button != null ) + { + button.IsChecked = ( currentValue == null ) + ? false + : currentValue != null && currentValue.Equals( expectedValue ); + } } private void UpdateSelectedFontFamily() @@ -282,7 +285,7 @@ namespace Xceed.Wpf.Toolkit return; FontFamily currentFontFamily = ( FontFamily )value; - if( currentFontFamily != null ) + if( (currentFontFamily != null) && ( _cmbFontFamilies != null) ) { _cmbFontFamilies.SelectedItem = currentFontFamily; } @@ -299,7 +302,10 @@ namespace Xceed.Wpf.Toolkit if( value == DependencyProperty.UnsetValue ) return; - _cmbFontSizes.SelectedValue = value; + if( _cmbFontSizes != null ) + { + _cmbFontSizes.SelectedValue = value; + } } private void UpdateFontColor() @@ -316,7 +322,10 @@ namespace Xceed.Wpf.Toolkit Color? currentColor = ( ( value == null ) ? null : ( Color? )( ( SolidColorBrush )value ).Color ); - _cmbFontColor.SelectedColor = currentColor; + if( _cmbFontColor != null ) + { + _cmbFontColor.SelectedColor = currentColor; + } } private void UpdateFontBackgroundColor() @@ -333,7 +342,10 @@ namespace Xceed.Wpf.Toolkit Color? currentColor = ( ( value == null ) ? null : ( Color? )( ( SolidColorBrush )value ).Color ); - _cmbFontBackgroundColor.SelectedColor = currentColor; + if( _cmbFontBackgroundColor != null ) + { + _cmbFontBackgroundColor.SelectedColor = currentColor; + } } /// @@ -341,6 +353,9 @@ namespace Xceed.Wpf.Toolkit /// private void UpdateSelectionListType() { + if( (_btnNumbers == null) || ( _btnBullets == null) ) + return; + //uncheck both _btnBullets.IsChecked = false; _btnNumbers.IsChecked = false; @@ -371,7 +386,8 @@ namespace Xceed.Wpf.Toolkit /// private bool BothSelectionListsAreChecked() { - return _btnBullets.IsChecked == true && _btnNumbers.IsChecked == true; + return (( _btnBullets != null) && (_btnBullets.IsChecked == true) ) + && (( _btnNumbers != null) && (_btnNumbers.IsChecked == true)); } void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value ) @@ -427,8 +443,11 @@ namespace Xceed.Wpf.Toolkit { get { - return ( _cmbFontFamilies.IsDropDownOpen || _cmbFontSizes.IsDropDownOpen || - _cmbFontBackgroundColor.IsOpen || _cmbFontColor.IsOpen || _waitingForMouseOver ); + return ( (( _cmbFontFamilies != null) && _cmbFontFamilies.IsDropDownOpen) + || (( _cmbFontSizes != null) && _cmbFontSizes.IsDropDownOpen) + || (( _cmbFontBackgroundColor != null) && _cmbFontBackgroundColor.IsOpen) + || (( _cmbFontColor != null) && _cmbFontColor.IsOpen) + || _waitingForMouseOver ); } } diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs index 5b8a9752..1b3c53d9 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs @@ -204,19 +204,31 @@ namespace Xceed.Wpf.Toolkit { Point mousePosition = Mouse.GetPosition( _richTextBox ); - double left = mousePosition.X; - double top = ( mousePosition.Y - 15 ) - adorningEditor.ActualHeight; + var left = mousePosition.X; + var top = mousePosition.Y; - //top + // Top boundary if( top < 0 ) { - top = mousePosition.Y + 10; + top = 5d; } - //right boundary - if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20 ) + // Left boundary + if( left < 0 ) { - left = left - ( adorningEditor.ActualWidth - ( _richTextBox.ActualWidth - left ) ); + left = 5d; + } + + // Right boundary + if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 10d ) + { + left = _richTextBox.ActualWidth - adorningEditor.ActualWidth - 10d; + } + + // Bottom boundary + if( top + adorningEditor.ActualHeight > _richTextBox.ActualHeight - 10d ) + { + top = _richTextBox.ActualHeight - adorningEditor.ActualHeight - 10d; } _adorner.SetOffsets( left, top ); diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml index d97f65d1..e9ff8926 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml @@ -40,6 +40,7 @@ + diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml index 2674d29e..0477349a 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml @@ -39,6 +39,7 @@ + diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs index 1ce7e195..9e82d3a5 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs @@ -222,6 +222,24 @@ namespace Xceed.Wpf.Toolkit TimeSpan current = this.Value.HasValue ? this.Value.Value : new TimeSpan(); TimeSpan result; var success = TimeSpan.TryParse( currentValue, out result ); + if( !success ) + { + // Validate when more than 60 seconds (or more than 60 minutes, or more than 24 hours) are entered. + var separators = currentValue.Where( x => x == ':' || x == '.' ).ToList(); + var values = currentValue.Split( new char[] { ':', '.' } ); + if( values.Count() >= 2 ) + { + bool haveDays = separators.First() == '.'; + bool haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' ); + + result = new TimeSpan( haveDays ? int.Parse( values[ 0 ] ) : 0, //Days + haveDays ? int.Parse( values[ 1 ] ) : int.Parse( values[ 0 ] ), //Hours + haveDays ? int.Parse( values[ 2 ] ) : int.Parse( values[ 1 ] ), //Minutes + (haveDays && this.ShowSeconds) ? int.Parse( values[ 3 ] ) : this.ShowSeconds ? int.Parse( values[ 2 ] ) : 0, //Seconds + haveMS ? int.Parse( values.Last() ) : 0 ); //Milliseconds + } + } + currentValue = result.ToString(); // When text is typed, if UpdateValueOnEnterKey is true, diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs index 1b15b161..5cae21ae 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs @@ -27,25 +27,6 @@ namespace Xceed.Wpf.Toolkit { #region Properties - #region SelectAllOnGotFocus (Obsolete) - - [Obsolete( "This property is obsolete and should no longer be used. Use AutoSelectTextBox.AutoSelectBehavior instead." )] - public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new PropertyMetadata( false ) ); - [Obsolete( "This property is obsolete and should no longer be used. Use AutoSelectTextBox.AutoSelectBehavior instead." )] - public bool SelectAllOnGotFocus - { - get - { - return ( bool )GetValue( SelectAllOnGotFocusProperty ); - } - set - { - SetValue( SelectAllOnGotFocusProperty, value ); - } - } - - #endregion //SelectAllOnGotFocus - #region KeepWatermarkOnGotFocus public static readonly DependencyProperty KeepWatermarkOnGotFocusProperty = DependencyProperty.Register( "KeepWatermarkOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new UIPropertyMetadata( false ) ); @@ -107,29 +88,6 @@ namespace Xceed.Wpf.Toolkit } #endregion //Constructors - - #region Base Class Overrides - - protected override void OnGotFocus( RoutedEventArgs e ) - { - base.OnGotFocus( e ); - - if( SelectAllOnGotFocus ) - SelectAll(); - } - - protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e ) - { - if( !IsKeyboardFocused && SelectAllOnGotFocus ) - { - e.Handled = true; - Focus(); - } - - base.OnPreviewMouseLeftButtonDown( e ); //Focus AutoSelectTextBox and eat the event - } - - #endregion //Base Class Overrides } #pragma warning restore 0618 diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj index d92e2a5a..8f186366 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj @@ -50,7 +50,10 @@ - + + False + ..\..\..\3.4.0\dlls\WPFToolkit.dll + @@ -61,6 +64,14 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -382,6 +393,10 @@ + + + + diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs index c086aa25..3e2bf0ca 100644 --- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs @@ -41,6 +41,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox { private const string PART_VerticalScrollBar = "PART_VerticalScrollBar"; private const string PART_HorizontalScrollBar = "PART_HorizontalScrollBar"; + private bool _isUpdatingVisualTree = false; #region Constructors @@ -859,7 +860,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox private static readonly DependencyPropertyKey ViewFinderPropertyKey = DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ), - new FrameworkPropertyMetadata( null ) ); + new FrameworkPropertyMetadata( null, new PropertyChangedCallback( Zoombox.OnViewFinderChanged ) ) ); public static readonly DependencyProperty ViewFinderProperty = Zoombox.ViewFinderPropertyKey.DependencyProperty; @@ -869,6 +870,20 @@ namespace Xceed.Wpf.Toolkit.Zoombox { return ( FrameworkElement )this.GetValue( Zoombox.ViewFinderProperty ); } + set + { + this.SetValue( Zoombox.ViewFinderPropertyKey, value ); + } + } + + private static void OnViewFinderChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) + { + ( ( Zoombox )d ).OnViewFinderChanged( e ); + } + + private void OnViewFinderChanged( DependencyPropertyChangedEventArgs e ) + { + this.AttachToVisualTree(); } #endregion @@ -2038,6 +2053,11 @@ namespace Xceed.Wpf.Toolkit.Zoombox private void AttachToVisualTree() { + if( _isUpdatingVisualTree ) + return; + + _isUpdatingVisualTree = true; + // detach from the old tree this.DetachFromVisualTree(); @@ -2067,24 +2087,12 @@ namespace Xceed.Wpf.Toolkit.Zoombox if( _contentPresenter == null ) throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxTemplateNeedsContent" ) ); - //locate the vertical scrollBar - if( _verticalScrollBar != null ) - { - _verticalScrollBar.Scroll -= this.VerticalScrollBar_Scroll; - } - _verticalScrollBar = this.GetTemplateChild( PART_VerticalScrollBar ) as ScrollBar; if( _verticalScrollBar == null ) throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox vertical scrollBar not found." ) ); _verticalScrollBar.Scroll += this.VerticalScrollBar_Scroll; - //locate the horizontal scrollBar - if( _horizontalScrollBar != null ) - { - _horizontalScrollBar.Scroll -= this.HorizontalScrollBar_Scroll; - } - _horizontalScrollBar = this.GetTemplateChild( PART_HorizontalScrollBar ) as ScrollBar; if( _horizontalScrollBar == null ) throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox horizontal scrollBar not found." ) ); @@ -2120,11 +2128,24 @@ namespace Xceed.Wpf.Toolkit.Zoombox // If we don't do the following, the content is not laid out correctly (centered) initially. VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true ); - // set a reference to the ViewFinder element, if present - this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement ); + // User has not defined a ViewFinder, use the one from this template + if( this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null ) + { + // set a reference to the ViewFinder element, if present + this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement ); + Zoombox.SetViewFinderVisibility( this, Visibility.Collapsed ); + } + else + { + //user has defined a ViewFinder, hide the one from this template + Zoombox.SetViewFinderVisibility( this, Visibility.Hidden ); + } // locate the view finder display panel - _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay; + if( this.ViewFinder != null ) + { + _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this.ViewFinder, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay; + } // if a ViewFinder was specified but no display panel is present, throw an exception if( this.ViewFinder != null && _viewFinderDisplay == null ) @@ -2149,8 +2170,12 @@ namespace Xceed.Wpf.Toolkit.Zoombox _viewFinderDisplay.SetBinding( ZoomboxViewFinderDisplay.ViewportRectProperty, binding ); } + this.UpdateViewFinderDisplayContentBounds(); + // set up event handler to run once the content presenter has been arranged _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged ); + + _isUpdatingVisualTree = false; } private void CreateVisualBrushForViewFinder( Visual visual ) @@ -2244,12 +2269,14 @@ namespace Xceed.Wpf.Toolkit.Zoombox { IsAnimated = oldAnimated; } + //When ViewFinder is modified, this will refresh the ZoomboxViewFinderDisplay + this.ZoomTo( this.Scale ); } private void DetachFromVisualTree() { // remove the drag adorner - if( _dragAdorner != null ) + if( (_dragAdorner != null) && ( AdornerLayer.GetAdornerLayer( this ) != null ) ) AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner ); // remove the layout updated handler, if present @@ -2258,9 +2285,25 @@ namespace Xceed.Wpf.Toolkit.Zoombox _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged ); } + //locate the vertical scrollBar + if( _verticalScrollBar != null ) + { + _verticalScrollBar.Scroll -= this.VerticalScrollBar_Scroll; + } + + //locate the horizontal scrollBar + if( _horizontalScrollBar != null ) + { + _horizontalScrollBar.Scroll -= this.HorizontalScrollBar_Scroll; + } + // remove the view finder display panel's visual brush and adorner if( _viewFinderDisplay != null ) { + _viewFinderDisplay.MouseMove -= new MouseEventHandler( this.ViewFinderDisplayMouseMove ); + _viewFinderDisplay.MouseLeftButtonDown -= new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture ); + _viewFinderDisplay.MouseLeftButtonUp -= new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture ); + BindingOperations.ClearBinding( _viewFinderDisplay, ZoomboxViewFinderDisplay.ViewportRectProperty ); _viewFinderDisplay = null; } @@ -2275,8 +2318,18 @@ namespace Xceed.Wpf.Toolkit.Zoombox private void VerticalScrollBar_Scroll( object sender, ScrollEventArgs e ) { - double diff = e.NewValue + _relativePosition.Y; - this.OnDrag( new DragDeltaEventArgs( 0d, -diff / this.Scale ), false ); + double diff = -(e.NewValue + _relativePosition.Y); + + if( e.ScrollEventType == ScrollEventType.LargeIncrement ) + { + diff = -_verticalScrollBar.ViewportSize; + } + else if( e.ScrollEventType == ScrollEventType.LargeDecrement ) + { + diff = _verticalScrollBar.ViewportSize; + } + + this.OnDrag( new DragDeltaEventArgs( 0d, diff / this.Scale ), false ); // Raise the Scroll event to user EventHandler handler = this.Scroll; @@ -2288,8 +2341,17 @@ namespace Xceed.Wpf.Toolkit.Zoombox private void HorizontalScrollBar_Scroll( object sender, ScrollEventArgs e ) { - double diff = e.NewValue + _relativePosition.X; - this.OnDrag( new DragDeltaEventArgs( -diff / this.Scale, 0d ), false ); + double diff = -( e.NewValue + _relativePosition.X ); + if( e.ScrollEventType == ScrollEventType.LargeIncrement ) + { + diff = -_horizontalScrollBar.ViewportSize; + } + else if( e.ScrollEventType == ScrollEventType.LargeDecrement ) + { + diff = _horizontalScrollBar.ViewportSize; + } + + this.OnDrag( new DragDeltaEventArgs( diff / this.Scale, 0d ), false ); // Raise the Scroll event to user EventHandler handler = this.Scroll; @@ -2439,6 +2501,11 @@ namespace Xceed.Wpf.Toolkit.Zoombox Point relativePosition = _relativePosition; double scale = this.Scale; Point newPosition = relativePosition + ( this.ContentOffset * scale ) + new Vector( e.HorizontalChange * scale, e.VerticalChange * scale ); + if( this.IsUsingScrollBars ) + { + newPosition.X = Math.Max( Math.Min( newPosition.X, 0d ), -_horizontalScrollBar.Maximum ); + newPosition.Y = Math.Max( Math.Min( newPosition.Y, 0d ), -_verticalScrollBar.Maximum ); + } // update the transform this.UpdateView( new ZoomboxView( scale, newPosition ), false, end ); diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..53913158 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml new file mode 100644 index 00000000..5b514da6 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..b8d1a408 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml new file mode 100644 index 00000000..28298aa0 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..d5f3e01d Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml new file mode 100644 index 00000000..b88985ee Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..e9d4daa8 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml new file mode 100644 index 00000000..dda913a2 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..6b072131 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml new file mode 100644 index 00000000..5b288225 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..c31f8223 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml new file mode 100644 index 00000000..ac92ac56 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..52c508ff Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml new file mode 100644 index 00000000..1abf6257 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..cebcaf48 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml new file mode 100644 index 00000000..7ba5a79c Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml new file mode 100644 index 00000000..a410ec9a Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs new file mode 100644 index 00000000..5d455104 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs @@ -0,0 +1,111 @@ +#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4B183CADB2380372C2D0B9CC2B853192" +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.8794 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Diagnostics; +using System.Windows; +using System.Windows.Automation; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Effects; +using System.Windows.Media.Imaging; +using System.Windows.Media.Media3D; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; +using System.Windows.Shapes; +using Xceed.Wpf.Toolkit; +using Xceed.Wpf.Toolkit.Chromes; +using Xceed.Wpf.Toolkit.Converters; +using Xceed.Wpf.Toolkit.Core.Converters; +using Xceed.Wpf.Toolkit.Primitives; +using Xceed.Wpf.Toolkit.Themes; + + +namespace Xceed.Wpf.Toolkit { + + + /// + /// CollectionControlDialog + /// + public partial class CollectionControlDialog : Xceed.Wpf.Toolkit.CollectionControlDialogBase, System.Windows.Markup.IComponentConnector { + + + #line 32 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" + internal Xceed.Wpf.Toolkit.CollectionControl _collectionControl; + + #line default + #line hidden + + private bool _contentLoaded; + + /// + /// InitializeComponent + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void InitializeComponent() { + if (_contentLoaded) { + return; + } + _contentLoaded = true; + System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit;component/collectioncontrol/implementation/collectioncontroldi" + + "alog.xaml", System.UriKind.Relative); + + #line 1 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" + System.Windows.Application.LoadComponent(this, resourceLocater); + + #line default + #line hidden + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) { + return System.Delegate.CreateDelegate(delegateType, this, handler); + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + switch (connectionId) + { + case 1: + this._collectionControl = ((Xceed.Wpf.Toolkit.CollectionControl)(target)); + return; + case 2: + + #line 44 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OkButton_Click); + + #line default + #line hidden + return; + case 3: + + #line 48 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click); + + #line default + #line hidden + return; + } + this._contentLoaded = true; + } + } +} + diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..fae0e7cd Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml new file mode 100644 index 00000000..dfbcb8f4 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..e6f9cf32 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml new file mode 100644 index 00000000..d4247261 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..cb67fe73 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml new file mode 100644 index 00000000..8f002dc8 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..5a1a4282 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml new file mode 100644 index 00000000..6cff207f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..50e2ad10 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml new file mode 100644 index 00000000..9e60289e Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..66c8aa53 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml new file mode 100644 index 00000000..02165a7c Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs new file mode 100644 index 00000000..4a59f27e --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs @@ -0,0 +1,61 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.8794 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} + diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..97beeb7b Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml new file mode 100644 index 00000000..97beeb7b Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml new file mode 100644 index 00000000..18977d07 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..0271d079 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml new file mode 100644 index 00000000..804bbd9c Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..85d31d43 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml new file mode 100644 index 00000000..0416d35e Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..df1e0433 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml new file mode 100644 index 00000000..eebc1150 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..1bc5b5aa Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml new file mode 100644 index 00000000..aace64ce Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml new file mode 100644 index 00000000..003d455e Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml new file mode 100644 index 00000000..5039d17b Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml new file mode 100644 index 00000000..a2c50122 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml new file mode 100644 index 00000000..2e35c058 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..f7e5f2cf Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml new file mode 100644 index 00000000..cce696da Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..d4be6ebc Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml new file mode 100644 index 00000000..c64957ab Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..9ad29679 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml new file mode 100644 index 00000000..c548c999 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..74c59e67 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml new file mode 100644 index 00000000..773ca49a Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml new file mode 100644 index 00000000..5cbc9e8f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml new file mode 100644 index 00000000..d3cb0c4c Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml new file mode 100644 index 00000000..dd6d1627 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..27bf28c9 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml new file mode 100644 index 00000000..7dd410f3 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml new file mode 100644 index 00000000..1fb4df52 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml new file mode 100644 index 00000000..d8b9f202 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml new file mode 100644 index 00000000..7ce9b117 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml new file mode 100644 index 00000000..9d91a503 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml new file mode 100644 index 00000000..150f0e6c Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml new file mode 100644 index 00000000..ebd8adbe Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml new file mode 100644 index 00000000..be2f2b90 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml new file mode 100644 index 00000000..b348f7ad Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml new file mode 100644 index 00000000..befe3d6f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml new file mode 100644 index 00000000..befe3d6f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml new file mode 100644 index 00000000..befe3d6f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml new file mode 100644 index 00000000..befe3d6f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml new file mode 100644 index 00000000..befe3d6f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..f6a544ea Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml new file mode 100644 index 00000000..ee39d961 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..074c382c Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml new file mode 100644 index 00000000..5a53598f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..de04898f Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml new file mode 100644 index 00000000..843187a9 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..206e26fe Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml new file mode 100644 index 00000000..5aed1ff8 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..1d453b96 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml new file mode 100644 index 00000000..eecf4104 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources new file mode 100644 index 00000000..67ef7128 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt new file mode 100644 index 00000000..252d05da --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt @@ -0,0 +1,95 @@ +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.dll +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.pdb +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\WPFToolkit.dll +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ResolveAssemblyReference.cache +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\classic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.homestead.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.metallic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.normalcolor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\royale.normalcolor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.g.cs +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.cache +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.lref +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\SelectorItem.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\WindowControl.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\SelectorItem.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\WindowControl.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Magnifier\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Brushes.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Buttons.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Common.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Glyphs.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Brushes_NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Buttons_NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Brushes.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Buttons.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Common.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Glyphs.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Aero2.NormalColor.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Generic.baml +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.g.resources +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.dll +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.pdb diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources new file mode 100644 index 00000000..c91f7b56 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref new file mode 100644 index 00000000..f865300f --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref @@ -0,0 +1,78 @@ +D:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs + +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml +FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.2.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml new file mode 100644 index 00000000..a1c10b38 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml differ diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml new file mode 100644 index 00000000..93902865 Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml differ