From e127a730a2d6a9e8e08536bc3f74ef54c6879b46 Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 13:49:04 +0100 Subject: [PATCH 01/13] Moved Xceed.Wpf.AvalonDock to AvalonDock along with unit test prject and TestApp project (other projects are yet to be refactored) --- .../AvalonDockTest/AnchorablePaneTest.cs | 2 +- .../AvalonDockTest/AvalonDockTest.csproj | 13 +-- .../AvalonDockTest/DockingUtilitiesTest.cs | 2 +- ...youtAnchorableFloatingWindowControlTest.cs | 2 +- .../AvalonDockTest/LayoutAnchorableTest.cs | 6 +- source/AvalonDock.sln | 2 +- ...pf.AvalonDock.csproj => AvalonDock.csproj} | 108 +++++++++--------- .../Commands/RelayCommand.cs | 2 +- .../AnchorablePaneControlOverlayArea.cs | 2 +- .../Controls/AnchorablePaneDropTarget.cs | 4 +- .../Controls/AnchorablePaneTabPanel.cs | 4 +- .../Controls/AnchorablePaneTitle.cs | 4 +- .../Controls/AutoHideWindowManager.cs | 4 +- .../Controls/BindingHelper.cs | 2 +- .../Controls/ContextMenuEx.cs | 2 +- .../Controls/DockingManagerDropTarget.cs | 4 +- .../Controls/DockingManagerOverlayArea.cs | 2 +- .../DocumentPaneControlOverlayArea.cs | 2 +- .../DocumentPaneDropAsAnchorableTarget.cs | 4 +- .../Controls/DocumentPaneDropTarget.cs | 4 +- .../Controls/DocumentPaneGroupDropTarget.cs | 4 +- .../Controls/DocumentPaneTabPanel.cs | 4 +- .../Controls/DragService.cs | 4 +- .../Xceed.Wpf.AvalonDock/Controls/DropArea.cs | 2 +- .../Controls/DropDownButton.cs | 2 +- .../Controls/DropDownControlArea.cs | 2 +- .../Controls/DropTarget.cs | 4 +- .../Controls/DropTargetBase.cs | 2 +- .../Controls/DropTargetType.cs | 2 +- .../Controls/Extentions.cs | 2 +- .../Controls/FocusElementManager.cs | 4 +- .../Controls/FullWeakDictionary.cs | 2 +- .../Controls/IDropTarget.cs | 4 +- .../Controls/IOverlayWindow.cs | 2 +- .../Controls/IOverlayWindowArea.cs | 2 +- .../Controls/IOverlayWindowDropTarget.cs | 2 +- .../Controls/IOverlayWindowHost.cs | 2 +- .../Controls/LayoutAnchorControl.cs | 4 +- .../Controls/LayoutAnchorGroupControl.cs | 4 +- .../Controls/LayoutAnchorSideControl.cs | 4 +- .../Controls/LayoutAnchorableControl.cs | 4 +- .../LayoutAnchorableFloatingWindowControl.cs | 10 +- .../Controls/LayoutAnchorableItem.cs | 6 +- .../Controls/LayoutAnchorablePaneControl.cs | 66 +++++------ .../LayoutAnchorablePaneGroupControl.cs | 4 +- .../Controls/LayoutAnchorableTabItem.cs | 4 +- .../Controls/LayoutAutoHideWindowControl.cs | 4 +- .../Controls/LayoutDocumentControl.cs | 4 +- .../LayoutDocumentFloatingWindowControl.cs | 4 +- .../Controls/LayoutDocumentItem.cs | 4 +- .../Controls/LayoutDocumentPaneControl.cs | 68 +++++------ .../LayoutDocumentPaneGroupControl.cs | 4 +- .../Controls/LayoutDocumentTabItem.cs | 4 +- .../Controls/LayoutFloatingWindowControl.cs | 6 +- .../Controls/LayoutGridControl.cs | 4 +- .../Controls/LayoutGridResizerControl.cs | 2 +- .../Controls/LayoutItem.cs | 6 +- .../Controls/LayoutPanelControl.cs | 4 +- .../Controls/MenuItemEx.cs | 2 +- .../Controls/NavigatorWindow.cs | 6 +- .../Controls/OverlayArea.cs | 2 +- .../Controls/OverlayWindow.cs | 6 +- .../Controls/OverlayWindowDropTarget.cs | 2 +- .../Controls/OverlayWindowDropTargetType.cs | 2 +- .../Controls/ReentrantFlag.cs | 2 +- .../Controls/TransformExtentions.cs | 2 +- .../Controls/WeakDictionary.cs | 2 +- .../Controls/WindowActivateEventArgs.cs | 2 +- .../Controls/WindowHookHandler.cs | 2 +- ...mmandLayoutItemFromLayoutModelConverter.cs | 4 +- .../Converters/AnchorSideToAngleConverter.cs | 4 +- .../AnchorSideToOrientationConverter.cs | 4 +- ...rableContextMenuHideVisibilityConverter.cs | 2 +- ...mmandLayoutItemFromLayoutModelConverter.cs | 6 +- .../Converters/BoolToVisibilityConverter.cs | 2 +- ...mmandLayoutItemFromLayoutModelConverter.cs | 6 +- .../InverseBoolToVisibilityConverter.cs | 2 +- .../LayoutItemFromLayoutModelConverter.cs | 4 +- .../Converters/NullToDoNothingConverter.cs | 2 +- .../UriSourceToBitmapImageConverter.cs | 2 +- .../Xceed.Wpf.AvalonDock/DockingManager.cs | 8 +- .../DocumentClosedEventArgs.cs | 4 +- .../DocumentClosingEventArgs.cs | 4 +- .../Xceed.Wpf.AvalonDock/Extentions.cs | 2 +- .../Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs | 2 +- .../Layout/AnchorableShowStrategy.cs | 2 +- .../Layout/ChildrenTreeChangedEventArgs.cs | 2 +- .../Xceed.Wpf.AvalonDock/Layout/Extentions.cs | 2 +- .../Layout/IAdjustableSizeLayout.cs | 2 +- .../Layout/ILayoutAnchorablePane.cs | 2 +- .../Layout/ILayoutContainer.cs | 2 +- .../Layout/ILayoutContentSelector.cs | 2 +- .../Layout/ILayoutControl.cs | 2 +- .../Layout/ILayoutDocumentPane.cs | 2 +- .../Layout/ILayoutElement.cs | 2 +- ...LayoutElementForFloatingWindowExtension.cs | 2 +- .../Layout/ILayoutElementWithVisibility.cs | 2 +- .../Layout/ILayoutGroup.cs | 2 +- .../Layout/ILayoutOrientableElement.cs | 2 +- .../Layout/ILayoutPane.cs | 2 +- .../Layout/ILayoutPaneSerializable.cs | 2 +- .../Layout/ILayoutPanelElement.cs | 2 +- .../Layout/ILayoutPositionableElement.cs | 2 +- .../Layout/ILayoutPreviousContainer.cs | 2 +- .../Layout/ILayoutRoot.cs | 2 +- .../Layout/ILayoutUpdateStrategy.cs | 2 +- .../Layout/LayoutAnchorGroup.cs | 2 +- .../Layout/LayoutAnchorSide.cs | 2 +- .../Layout/LayoutAnchorable.cs | 2 +- .../Layout/LayoutAnchorableFloatingWindow.cs | 2 +- .../Layout/LayoutAnchorablePane.cs | 2 +- .../Layout/LayoutAnchorablePaneGroup.cs | 2 +- .../Layout/LayoutContent.cs | 4 +- .../Layout/LayoutDocument.cs | 2 +- .../Layout/LayoutDocumentFloatingWindow.cs | 2 +- .../Layout/LayoutDocumentPane.cs | 2 +- .../Layout/LayoutDocumentPaneGroup.cs | 2 +- .../Layout/LayoutElement.cs | 2 +- .../Layout/LayoutElementEventArgs.cs | 2 +- .../Layout/LayoutFloatingWindow.cs | 2 +- .../Layout/LayoutGroup.cs | 2 +- .../Layout/LayoutGroupBase.cs | 2 +- .../Layout/LayoutPanel.cs | 2 +- .../Layout/LayoutPositionableGroup.cs | 2 +- .../Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs | 2 +- .../LayoutSerializationCallbackEventArgs.cs | 2 +- .../Layout/Serialization/LayoutSerializer.cs | 2 +- .../Serialization/XmlLayoutSerializer.cs | 2 +- .../Xceed.Wpf.AvalonDock/LayoutEventArgs.cs | 4 +- .../Xceed.Wpf.AvalonDock/MathHelper.cs | 2 +- .../Properties/AssemblyInfo.cs | 10 +- .../Properties/Resources.Designer.cs | 4 +- .../Themes/DictionaryTheme.cs | 2 +- .../Themes/GenericTheme.cs | 2 +- .../Xceed.Wpf.AvalonDock/Themes/Theme.cs | 2 +- .../Xceed.Wpf.AvalonDock/Themes/generic.xaml | 66 +++++------ .../Xceed.Wpf.AvalonDock/Win32Helper.cs | 2 +- .../Xceed.Wpf.AvalonDock/WindowHelper.cs | 2 +- source/TestApp/MainWindow.xaml.cs | 6 +- source/TestApp/TestApp.csproj | 2 +- 140 files changed, 360 insertions(+), 361 deletions(-) rename source/Components/Xceed.Wpf.AvalonDock/{Xceed.Wpf.AvalonDock.csproj => AvalonDock.csproj} (94%) diff --git a/source/AutomationTest/AvalonDockTest/AnchorablePaneTest.cs b/source/AutomationTest/AvalonDockTest/AnchorablePaneTest.cs index cf070859..af2a49ad 100644 --- a/source/AutomationTest/AvalonDockTest/AnchorablePaneTest.cs +++ b/source/AutomationTest/AvalonDockTest/AnchorablePaneTest.cs @@ -2,7 +2,7 @@ { using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Threading.Tasks; - using Xceed.Wpf.AvalonDock.Layout; + using AvalonDock.Layout; using AvalonDockTest.TestHelpers; using AvalonDockTest.views; diff --git a/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj b/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj index a80e8e78..7418220e 100644 --- a/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj +++ b/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj @@ -80,12 +80,6 @@ - - - {db81988f-e0f2-45a0-a1fd-8c37f3d35244} - Xceed.Wpf.AvalonDock - - MSBuild:Compile @@ -100,7 +94,12 @@ Designer - + + + {db81988f-e0f2-45a0-a1fd-8c37f3d35244} + AvalonDock + + diff --git a/source/AutomationTest/AvalonDockTest/DockingUtilitiesTest.cs b/source/AutomationTest/AvalonDockTest/DockingUtilitiesTest.cs index fc793fb6..4597c8bb 100644 --- a/source/AutomationTest/AvalonDockTest/DockingUtilitiesTest.cs +++ b/source/AutomationTest/AvalonDockTest/DockingUtilitiesTest.cs @@ -5,7 +5,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; - using Xceed.Wpf.AvalonDock.Layout; + using AvalonDock.Layout; [TestClass] public sealed class DockingUtilitiesTest diff --git a/source/AutomationTest/AvalonDockTest/LayoutAnchorableFloatingWindowControlTest.cs b/source/AutomationTest/AvalonDockTest/LayoutAnchorableFloatingWindowControlTest.cs index ca3f0cfa..712b5060 100644 --- a/source/AutomationTest/AvalonDockTest/LayoutAnchorableFloatingWindowControlTest.cs +++ b/source/AutomationTest/AvalonDockTest/LayoutAnchorableFloatingWindowControlTest.cs @@ -4,7 +4,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; - using Xceed.Wpf.AvalonDock.Layout.Serialization; + using AvalonDock.Layout.Serialization; using AvalonDockTest.TestHelpers; using AvalonDockTest.Views; diff --git a/source/AutomationTest/AvalonDockTest/LayoutAnchorableTest.cs b/source/AutomationTest/AvalonDockTest/LayoutAnchorableTest.cs index 957b35af..d094e23e 100644 --- a/source/AutomationTest/AvalonDockTest/LayoutAnchorableTest.cs +++ b/source/AutomationTest/AvalonDockTest/LayoutAnchorableTest.cs @@ -5,9 +5,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using Xceed.Wpf.AvalonDock.Controls; -using Xceed.Wpf.AvalonDock.Converters; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Controls; +using AvalonDock.Converters; +using AvalonDock.Layout; namespace AvalonDockTest { diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln index 057efef6..060457da 100644 --- a/source/AvalonDock.sln +++ b/source/AvalonDock.sln @@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Projects", "Test Proje EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AvalonDock", "AvalonDock", "{B0EB64E3-2C25-46CC-BBB6-E38EF2584177}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock", "Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock", "Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}" EndProject diff --git a/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj b/source/Components/Xceed.Wpf.AvalonDock/AvalonDock.csproj similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj rename to source/Components/Xceed.Wpf.AvalonDock/AvalonDock.csproj index 4b6c44cc..53cfe9e4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj +++ b/source/Components/Xceed.Wpf.AvalonDock/AvalonDock.csproj @@ -1,54 +1,54 @@ - - - Xceed.Wpf.AvalonDock - netcoreapp3.0;net4 - true - true - sn.snk - true - 4.00 - 4.00 - 4.00 - Open Source - Dirkster.AvalonDock - 2017-2019 - This assembly implements a docking layout system for WPF. - https://github.com/Dirkster99/AvalonDock - https://github.com/Dirkster99/AvalonDock - Dirkster.AvalonDock - https://github.com/Dirkster99/AvalonDock - LICENSE.txt - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - PublicResXFileCodeGenerator - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - + + + AvalonDock + netcoreapp3.0;net4 + true + true + sn.snk + true + 4.00 + 4.00 + 4.00 + Open Source + Dirkster.AvalonDock + 2017-2019 + This assembly implements a docking layout system for WPF. + https://github.com/Dirkster99/AvalonDock + https://github.com/Dirkster99/AvalonDock + Dirkster.AvalonDock + https://github.com/Dirkster99/AvalonDock + LICENSE.txt + + + + + + + + + + + + + + + + True + True + Resources.resx + + + + + PublicResXFileCodeGenerator + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + + + + diff --git a/source/Components/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs b/source/Components/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs index 1ffd87c2..228e63a8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Input; -namespace Xceed.Wpf.AvalonDock.Commands +namespace AvalonDock.Commands { internal class RelayCommand : ICommand { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs index ccb44545..0798dd7f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class AnchorablePaneControlOverlayArea : OverlayArea { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs index 74291d93..c2e2634e 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class AnchorablePaneDropTarget : DropTarget { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs index 2920a2e0..111d709e 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows.Controls; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class AnchorablePaneTabPanel : Panel { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs index 37b82f0a..c2ec683b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows; using System.Windows.Input; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class AnchorablePaneTitle : Control { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs index 51706782..af4ef9ae 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Threading; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class AutoHideWindowManager { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs index e29d90a4..969f6660 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs @@ -20,7 +20,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Data; using System.Windows.Threading; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class BindingHelper { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs index 09d041ad..3e60a457 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows.Data; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class ContextMenuEx : ContextMenu { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs index 164fa39a..a9c1312d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class DockingManagerDropTarget : DropTarget { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs index 1f93fcb6..70bb21f7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class DockingManagerOverlayArea : OverlayArea { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs index dfc42f1e..8496a56b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class DocumentPaneControlOverlayArea : OverlayArea { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs index c53baa62..a5f9e947 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class DocumentPaneDropAsAnchorableTarget : DropTarget { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs index 86f714d0..e1937bca 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class DocumentPaneDropTarget : DropTarget { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs index b7d4cb99..8c4baf35 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class DocumentPaneGroupDropTarget : DropTarget { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs index 07a2b5f6..4b2e0b7d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows.Controls; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class DocumentPaneTabPanel : Panel { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DragService.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DragService.cs index 41f7d30f..995a2f64 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DragService.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DragService.cs @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Collections.Generic; using System.Linq; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class DragService { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropArea.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropArea.cs index 714516d9..834b0a3b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropArea.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropArea.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public enum DropAreaType { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs index 2f87b91d..073a1dea 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Controls; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class DropDownButton : ToggleButton { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs index bb6fa9e4..bcc81c4f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows.Controls.Primitives; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class DropDownControlArea : UserControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs index 297fe42a..473eea9d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs @@ -19,10 +19,10 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows.Threading; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal abstract class DropTarget : DropTargetBase, IDropTarget where T : FrameworkElement { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs index c3887a5f..b7449cfd 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { abstract class DropTargetBase : DependencyObject { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs index 8d3fbd47..dcdf6654 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public enum DropTargetType { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Extentions.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/Extentions.cs index e22947e2..4a7a024e 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Extentions.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/Extentions.cs @@ -20,7 +20,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Media; using System.Windows.Media.Media3D; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public static class Extentions { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs index 3971200e..ec13be43 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs @@ -22,11 +22,11 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Interop; using System.Windows; using System.Diagnostics; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows.Media; using System.Windows.Threading; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal static class FocusElementManager { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs index 0218be7e..a85a3549 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Collections.Generic; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class FullWeakDictionary where K : class { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs index 3a5b7b25..74d7b935 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal interface IDropTarget { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs index 410c5071..6f700129 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Collections.Generic; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal interface IOverlayWindow { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs index 0c2126d7..e36b1f12 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal interface IOverlayWindowArea { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs index f3c0b778..af0184a6 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { interface IOverlayWindowDropTarget { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs index 64bccb76..0846ff4b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Collections.Generic; using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal interface IOverlayWindowHost { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs index 231a5d8a..d4b44faa 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs @@ -17,10 +17,10 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows; using System.Windows.Controls; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows.Threading; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAnchorControl : Control, ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs index 56047f9c..5bdd4ab5 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs @@ -17,11 +17,11 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows.Controls; using System.Collections.ObjectModel; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows; using System.Windows.Data; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAnchorGroupControl : Control, ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs index 58993317..6ee087ca 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs @@ -19,9 +19,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows; using System.Collections.ObjectModel; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAnchorSideControl : Control, ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs index 208794f5..c124b8f1 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Controls; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAnchorableControl : Control { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs index 7d1809a1..678d35b0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs @@ -20,13 +20,13 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Data; using System.Windows.Input; -using Xceed.Wpf.AvalonDock.Layout; -using Xceed.Wpf.AvalonDock.Converters; +using AvalonDock.Layout; +using AvalonDock.Converters; using System.Windows.Controls.Primitives; -using Xceed.Wpf.AvalonDock.Commands; +using AvalonDock.Commands; using Microsoft.Windows.Shell; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAnchorableFloatingWindowControl : LayoutFloatingWindowControl, IOverlayWindowHost { @@ -252,7 +252,7 @@ protected override IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, Int return base.FilterMessage(hwnd, msg, wParam, lParam, ref handled); } - internal override void UpdateThemeResources(Xceed.Wpf.AvalonDock.Themes.Theme oldTheme = null) + internal override void UpdateThemeResources(AvalonDock.Themes.Theme oldTheme = null) { base.UpdateThemeResources(oldTheme); diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs index fee08079..f0e78b13 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs @@ -15,13 +15,13 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ using System; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows.Input; using System.Windows; -using Xceed.Wpf.AvalonDock.Commands; +using AvalonDock.Commands; using System.Windows.Data; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAnchorableItem : LayoutItem { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs index e49de44e..f9455ed2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs @@ -1,36 +1,36 @@ -/************************************************************************************* - - 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 - +/************************************************************************************* + + Extended WPF Toolkit + + Copyright (C) 2007-2013 Xceed Software Inc. + + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license + + For more features, controls, and fast professional support, + pick up the Plus Edition at http://xceed.com/wpf_toolkit + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + ***********************************************************************************/ -using System; -using System.Windows.Controls; -using System.Windows; -using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; - -namespace Xceed.Wpf.AvalonDock.Controls +using System; +using System.Windows.Controls; +using System.Windows; +using System.Windows.Data; +using AvalonDock.Layout; + +namespace AvalonDock.Controls { public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer { - #region Members + #region Members private LayoutAnchorablePane _model; - #endregion + #endregion - #region Constructors + #region Constructors static LayoutAnchorablePaneControl() { @@ -52,9 +52,9 @@ public LayoutAnchorablePaneControl(LayoutAnchorablePane model) this.SizeChanged += OnSizeChanged; } - #endregion + #endregion - #region Properties + #region Properties public ILayoutElement Model { @@ -64,9 +64,9 @@ public ILayoutElement Model } } - #endregion + #endregion - #region Overrides + #region Overrides protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e) { @@ -96,9 +96,9 @@ protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonE } - #endregion + #endregion - #region Private Methods + #region Private Methods private void OnSizeChanged(object sender, SizeChangedEventArgs e) { @@ -107,6 +107,6 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e) modelWithActualSize.ActualHeight = ActualHeight; } - #endregion - } -} + #endregion + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs index 282f5597..53a2fa16 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAnchorablePaneGroupControl : LayoutGridControl, ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs index 2a0b387a..c2f3c4d5 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAnchorableTabItem : Control { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs index eb7d0434..8f5634b8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs @@ -23,9 +23,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Input; using System.Windows.Data; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutAutoHideWindowControl : HwndHost, ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs index bd425f17..1475d1a3 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutDocumentControl : Control { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs index 792b8716..85ac8f92 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs @@ -15,12 +15,12 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ using System; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows; using System.Windows.Controls.Primitives; using Microsoft.Windows.Shell; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutDocumentFloatingWindowControl : LayoutFloatingWindowControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs index e3c8c34c..a0504343 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs @@ -14,10 +14,10 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutDocumentItem : LayoutItem { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs index 496a4eca..90a8168f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs @@ -1,38 +1,38 @@ -/************************************************************************************* - - 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 - +/************************************************************************************* + + Extended WPF Toolkit + + Copyright (C) 2007-2013 Xceed Software Inc. + + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license + + For more features, controls, and fast professional support, + pick up the Plus Edition at http://xceed.com/wpf_toolkit + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; - -namespace Xceed.Wpf.AvalonDock.Controls +using System; +using System.Collections.Generic; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using AvalonDock.Layout; + +namespace AvalonDock.Controls { public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer { - #region Members + #region Members private List _logicalChildren = new List(); private LayoutDocumentPane _model; - #endregion + #endregion - #region Constructors + #region Constructors static LayoutDocumentPaneControl() { @@ -53,9 +53,9 @@ internal LayoutDocumentPaneControl(LayoutDocumentPane model) this.SizeChanged += OnSizeChanged; } - #endregion + #endregion - #region Properties + #region Properties public ILayoutElement Model { @@ -65,9 +65,9 @@ public ILayoutElement Model } } - #endregion + #endregion - #region Overrides + #region Overrides protected override System.Collections.IEnumerator LogicalChildren { @@ -103,9 +103,9 @@ protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonE } - #endregion + #endregion - #region Private Methods + #region Private Methods private void OnSizeChanged(object sender, SizeChangedEventArgs e) { @@ -114,6 +114,6 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e) modelWithAtcualSize.ActualHeight = ActualHeight; } - #endregion - } -} + #endregion + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs index 9806c886..c640d4ec 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutDocumentPaneGroupControl : LayoutGridControl, ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs index 7569355e..b159ed8f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs @@ -20,9 +20,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutDocumentTabItem : Control { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs index 36e3e0bc..4dea8e38 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs @@ -24,11 +24,11 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows.Data; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows.Documents; -using Xceed.Wpf.AvalonDock.Themes; +using AvalonDock.Themes; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public abstract class LayoutFloatingWindowControl : Window, ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs index a65012e9..5ed6b3df 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs @@ -21,10 +21,10 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Input; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows.Threading; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public abstract class LayoutGridControl : Grid, ILayoutControl, IAdjustableSizeLayout where T : class, ILayoutPanelElement { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs index ff82d073..6aea9773 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Media; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutGridResizerControl : Thumb { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs index b10a0330..5b75c60b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs @@ -17,14 +17,14 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Linq; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Windows.Input; -using Xceed.Wpf.AvalonDock.Commands; +using AvalonDock.Commands; using System.Windows.Data; using System.Windows.Media; using System.Windows.Controls; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public abstract class LayoutItem : FrameworkElement { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs index e5795f3b..c43d9aca 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Controls; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class LayoutPanelControl : LayoutGridControl, ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs index 97e9dcaa..2c8bdf38 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class MenuItemEx : MenuItem { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs index d2e371a5..bfd0c6ce 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs @@ -17,11 +17,11 @@ This program is provided to you under the terms of the Microsoft Public using System.Collections.Generic; using System.Linq; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; -using Xceed.Wpf.AvalonDock.Themes; +using AvalonDock.Layout; +using AvalonDock.Themes; using System.Windows.Controls; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { [TemplatePart(Name = PART_AnchorableListBox, Type = typeof(ListBox))] [TemplatePart(Name = PART_DocumentListBox, Type = typeof(ListBox))] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs index 6856ccfd..a2f1e982 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public abstract class OverlayArea : IOverlayWindowArea { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs index 430ac345..aa21ad15 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs @@ -19,10 +19,10 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Controls; using System.Windows.Shapes; -using Xceed.Wpf.AvalonDock.Layout; -using Xceed.Wpf.AvalonDock.Themes; +using AvalonDock.Layout; +using AvalonDock.Themes; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class OverlayWindow : Window, IOverlayWindow { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs index d37eb456..1aed9be7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public class OverlayWindowDropTarget : IOverlayWindowDropTarget { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs index 3f46ded1..9a9acae6 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { public enum OverlayWindowDropTargetType { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs index 5b5930da..4ee78160 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class ReentrantFlag { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs index b88663b0..a5b0ac22 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Media; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal static class TransformExtensions { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs index 64b88d8d..eaba5e35 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Collections.Generic; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class WeakDictionary where K : class { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs index 804294b2..cc0e4469 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class WindowActivateEventArgs : EventArgs { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs index 544bc2fb..2ace66c0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class FocusChangeEventArgs : EventArgs { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs index 45c5d32b..6ea7cf7c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { public class ActivateCommandLayoutItemFromLayoutModelConverter : IValueConverter { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs index e63779e2..3e55050e 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { [ValueConversion(typeof(AnchorSide), typeof(double))] public class AnchorSideToAngleConverter : IValueConverter diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs index 1c132613..f72c8358 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Data; using System.Windows.Controls; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { [ValueConversion(typeof(AnchorSide), typeof(Orientation))] public class AnchorSideToOrientationConverter : IValueConverter diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs index 6848e05f..92d8fb30 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs @@ -20,7 +20,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Data; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { public class AnchorableContextMenuHideVisibilityConverter : IMultiValueConverter { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs index b0cb4111..49acb539 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs @@ -16,10 +16,10 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; -using Xceed.Wpf.AvalonDock.Controls; +using AvalonDock.Layout; +using AvalonDock.Controls; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { public class AutoHideCommandLayoutItemFromLayoutModelConverter : IValueConverter { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs index 00ae1a27..82bc7ae0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Data; using System.Windows; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { [ValueConversion(typeof(bool), typeof(Visibility))] public class BoolToVisibilityConverter : IValueConverter diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs index 4b187424..c64210f1 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs @@ -16,10 +16,10 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; -using Xceed.Wpf.AvalonDock.Controls; +using AvalonDock.Layout; +using AvalonDock.Controls; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { public class HideCommandLayoutItemFromLayoutModelConverter : IValueConverter { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs index b0ee5b74..9ec5f78f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Data; using System.Windows; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { [ValueConversion(typeof(bool), typeof(Visibility))] public class InverseBoolToVisibilityConverter : IValueConverter diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs index 5666dc28..13d19624 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { public class LayoutItemFromLayoutModelConverter : IValueConverter { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs index ae43fde0..650ec9e3 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Data; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { public class NullToDoNothingConverter : IValueConverter { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs b/source/Components/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs index 7887e594..ce1d01fa 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs @@ -19,7 +19,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Media.Imaging; using System.Windows.Controls; -namespace Xceed.Wpf.AvalonDock.Converters +namespace AvalonDock.Converters { public class UriSourceToBitmapImageConverter : IValueConverter { diff --git a/source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs b/source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs index 3fc71bd2..6fc7097b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs @@ -22,17 +22,17 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Markup; using System.ComponentModel; using System.Windows.Interop; -using Xceed.Wpf.AvalonDock.Layout; -using Xceed.Wpf.AvalonDock.Controls; +using AvalonDock.Layout; +using AvalonDock.Controls; using System.Windows.Input; using System.Collections; using System.Collections.Specialized; using System.Windows.Data; using System.Windows.Threading; -using Xceed.Wpf.AvalonDock.Themes; +using AvalonDock.Themes; using System.Diagnostics; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { [ContentProperty("Layout")] [TemplatePart(Name = "PART_AutoHideArea")] diff --git a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs index d2f486c1..e8653240 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs @@ -15,9 +15,9 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ using System; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { public class DocumentClosedEventArgs : EventArgs { diff --git a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs index 97fcfec8..c29e6c60 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs @@ -15,9 +15,9 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ using System.ComponentModel; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { public class DocumentClosingEventArgs : CancelEventArgs { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Extentions.cs b/source/Components/Xceed.Wpf.AvalonDock/Extentions.cs index 4950dce2..92195993 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Extentions.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Extentions.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Collections.Generic; using System.Collections; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { internal static class Extensions { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs index 20882e00..f859e3d3 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public enum AnchorSide { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs index 80cd669b..ae7cc777 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Flags] public enum AnchorableShowStrategy : byte diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs index 6f237b56..a9a73318 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public enum ChildrenTreeChange { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/Extentions.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/Extentions.cs index 12810b46..ff1846ae 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/Extentions.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/Extentions.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Diagnostics; using System.Runtime.InteropServices; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public static class Extensions { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs index 05eeae5b..d1023657 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface IAdjustableSizeLayout { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs index 63cae180..cacc8432 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs @@ -15,7 +15,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutAnchorablePane : ILayoutPanelElement, ILayoutPane { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs index c5515ede..f2c90b6b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Collections.Generic; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutContainer : ILayoutElement { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs index 1f558271..2c8e2801 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutContentSelector { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs index da048041..3cb4980c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutControl { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs index 76cc264e..e1d181d8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutDocumentPane : ILayoutPanelElement, ILayoutPane { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs index a99fd6a3..738f0979 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.ComponentModel; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutElement : INotifyPropertyChanged, INotifyPropertyChanging { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs index 3145ca64..a5b5a3dd 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs @@ -1,4 +1,4 @@ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { using System.Runtime.InteropServices; using System.Windows; diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs index ac03a42c..550735b7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutElementWithVisibility { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs index 529386bb..63efc614 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutGroup : ILayoutContainer { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs index 0a34f24c..e98addf4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutOrientableGroup : ILayoutGroup { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs index 5532705f..1b8a1ce3 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutPane : ILayoutContainer, ILayoutElementWithVisibility { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs index 7c013cde..9331b5c3 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs @@ -15,7 +15,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { interface ILayoutPaneSerializable { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs index 9b3f2ce3..60c5c0fb 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs @@ -15,7 +15,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutPanelElement : ILayoutElement { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs index 0d5744a4..bf8a5864 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { internal interface ILayoutPositionableElement : ILayoutElement, ILayoutElementForFloatingWindow { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs index 2b99da5c..f7d13ba9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { interface ILayoutPreviousContainer { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs index c8e1269c..8eed813d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Collections.ObjectModel; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutRoot { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs index 7d97653e..f9e1b5f2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs @@ -14,7 +14,7 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutUpdateStrategy { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs index 4d2c7ea4..58922345 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Markup; using System.Xml.Serialization; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("Children")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs index 6dcbdb35..efbf0b9a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows.Markup; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("Children")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs index b2c9b743..0d9a55f6 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs @@ -22,7 +22,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Globalization; using System.ComponentModel; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Serializable] public class LayoutAnchorable : LayoutContent diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs index 50be02e3..2e0a90ca 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs @@ -22,7 +22,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Xml.Serialization; using System.Xml; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Serializable] [ContentProperty("RootPanel")] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs index 61e9b96e..05601a04 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs @@ -19,7 +19,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Markup; using System.Xml.Serialization; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("Children")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs index 66ba06bd..f9c267ea 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs @@ -19,7 +19,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows.Markup; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("Children")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs index a440818b..8c46e78f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs @@ -22,9 +22,9 @@ This program is provided to you under the terms of the Microsoft Public using System.Globalization; using System.Windows.Media; using System.ComponentModel; -using Xceed.Wpf.AvalonDock.Controls; +using AvalonDock.Controls; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("Content")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs index 366211c3..a568d049 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Globalization; using System.Linq; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Serializable] public class LayoutDocument : LayoutContent diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs index 52717f4b..9e87d773 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs @@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Xml.Serialization; using System.Xml; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("RootDocument")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs index e8b6c09e..5dc639e0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs @@ -19,7 +19,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows.Markup; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("Children")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs index 57dbf721..d7c26d20 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Controls; using System.Windows.Markup; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("Children")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs index 2569b7c4..4125af00 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs @@ -19,7 +19,7 @@ This program is provided to you under the terms of the Microsoft Public using System.ComponentModel; using System.Xml.Serialization; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Serializable] public abstract class LayoutElement : DependencyObject, ILayoutElement diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs index ec726867..69a810c6 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public class LayoutElementEventArgs : EventArgs { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs index 6f45945e..3ef7bb0e 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs @@ -20,7 +20,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Xml.Schema; using System.Xml; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Serializable] public abstract class LayoutFloatingWindow : LayoutElement, ILayoutContainer, IXmlSerializable diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs index cdc7717f..3fe3bb28 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs @@ -20,7 +20,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Collections.ObjectModel; using System.Xml.Serialization; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Serializable] public abstract class LayoutGroup : LayoutGroupBase, ILayoutContainer, ILayoutGroup, IXmlSerializable where T : class, ILayoutElement diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs index 245c6966..a649d631 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Xml.Serialization; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Serializable] public abstract class LayoutGroupBase : LayoutElement diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs index 045b3c85..992936a7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs @@ -19,7 +19,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows.Markup; using System.Windows.Controls; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("Children")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs index 133f624b..69e3364a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs @@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Linq; using System.Windows.Controls; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [Serializable] public abstract class LayoutPositionableGroup : LayoutGroup, ILayoutPositionableElementWithActualSize where T : class, ILayoutElement diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs index df459687..cd40cb19 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs @@ -27,7 +27,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Xml.Schema; using System.Windows.Controls; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { [ContentProperty("RootPanel")] [Serializable] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs index ea2bc5c9..66775215 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.ComponentModel; -namespace Xceed.Wpf.AvalonDock.Layout.Serialization +namespace AvalonDock.Layout.Serialization { public class LayoutSerializationCallbackEventArgs : CancelEventArgs { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs index b33eb258..aa8e72ce 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Linq; -namespace Xceed.Wpf.AvalonDock.Layout.Serialization +namespace AvalonDock.Layout.Serialization { public abstract class LayoutSerializer { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs index e0cfebed..51e18011 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Xml.Serialization; using System.IO; -namespace Xceed.Wpf.AvalonDock.Layout.Serialization +namespace AvalonDock.Layout.Serialization { public class XmlLayoutSerializer : LayoutSerializer { diff --git a/source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs index 04679358..3d57bd3b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs @@ -15,9 +15,9 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ using System; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { class LayoutEventArgs : EventArgs { diff --git a/source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs b/source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs index 792c6b43..e0753f3f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { internal static class MathHelper { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs index f2686a21..a400c9da 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs @@ -46,10 +46,10 @@ This program is provided to you under the terms of the Microsoft Public )] [assembly: XmlnsPrefix( "http://schemas.xceed.com/wpf/xaml/avalondock", "xcad" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Controls" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Converters" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Layout" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )] +[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock" )] +[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Controls" )] +[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Converters" )] +[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Layout" )] +[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs b/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs index 3ffcd06e..2fe6c5de 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Xceed.Wpf.AvalonDock.Properties { +namespace AvalonDock.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xceed.Wpf.AvalonDock.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AvalonDock.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs b/source/Components/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs index fd5cd3f4..1b1f9548 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public abstract class DictionaryTheme : Theme { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs b/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs index 8ee75811..da3771cf 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class GenericTheme : Theme { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs b/source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs index 9fbef9e9..fbc6e737 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public using System; using System.Windows; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public abstract class Theme : DependencyObject { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml b/source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml index a747cfe8..0ee40ecb 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml @@ -17,11 +17,11 @@ + xmlns:avalonDock="clr-namespace:AvalonDock" + xmlns:avalonDockLayout="clr-namespace:AvalonDock.Layout" + xmlns:avalonDockControls="clr-namespace:AvalonDock.Controls" + xmlns:avalonDockConverters="clr-namespace:AvalonDock.Converters" + xmlns:avalonDockProperties="clr-namespace:AvalonDock.Properties"> @@ -83,7 +83,7 @@ - + @@ -379,7 +379,7 @@ DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"> - + @@ -392,7 +392,7 @@ Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"> - + @@ -405,7 +405,7 @@ Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"> - + @@ -494,25 +494,25 @@ @@ -533,41 +533,41 @@ - - - - - @@ -590,41 +590,41 @@ - - - - - @@ -875,7 +875,7 @@ Visibility="Hidden" Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"> - + @@ -1041,7 +1041,7 @@ CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}" Grid.Column="2"> - + @@ -1053,7 +1053,7 @@ CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}" Grid.Column="2"> - + @@ -1064,7 +1064,7 @@ ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}" Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" Grid.Column="3"> - + @@ -1149,7 +1149,7 @@ DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}" DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"> - + @@ -1161,7 +1161,7 @@ CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}" Grid.Column="2"> - + @@ -1173,7 +1173,7 @@ CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}" Grid.Column="2"> - + @@ -1185,7 +1185,7 @@ ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}" Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" Grid.Column="3"> - + diff --git a/source/Components/Xceed.Wpf.AvalonDock/Win32Helper.cs b/source/Components/Xceed.Wpf.AvalonDock/Win32Helper.cs index ae3b8ca0..6a0a8f64 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Win32Helper.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Win32Helper.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Runtime.InteropServices; using System.Windows; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { internal static class Win32Helper { diff --git a/source/Components/Xceed.Wpf.AvalonDock/WindowHelper.cs b/source/Components/Xceed.Wpf.AvalonDock/WindowHelper.cs index 2d9cde0a..422e58bf 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/WindowHelper.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/WindowHelper.cs @@ -19,7 +19,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; using System.Windows.Interop; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { static class WindowHelper { diff --git a/source/TestApp/MainWindow.xaml.cs b/source/TestApp/MainWindow.xaml.cs index b88f877c..4401098f 100644 --- a/source/TestApp/MainWindow.xaml.cs +++ b/source/TestApp/MainWindow.xaml.cs @@ -21,11 +21,11 @@ This program is provided to you under the terms of the New BSD using System.Windows.Input; using System.Windows.Media; using System.Windows.Threading; -using Xceed.Wpf.AvalonDock.Layout; +using AvalonDock.Layout; using System.Diagnostics; using System.IO; -using Xceed.Wpf.AvalonDock.Layout.Serialization; -using Xceed.Wpf.AvalonDock; +using AvalonDock.Layout.Serialization; +using AvalonDock; namespace TestApp { diff --git a/source/TestApp/TestApp.csproj b/source/TestApp/TestApp.csproj index a4c58bb5..8c9842d4 100644 --- a/source/TestApp/TestApp.csproj +++ b/source/TestApp/TestApp.csproj @@ -14,6 +14,6 @@ - + From 4e45c09fbe6c4e0f68c07158f5284255e4a1e8be Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 13:58:32 +0100 Subject: [PATCH 02/13] Enabled MVVMTestApp for usage with AvalonDock library and namespace --- source/MVVMTestApp/FileStatsViewModel.cs | 14 +++++--------- source/MVVMTestApp/FileViewModel.cs | 10 +++++----- source/MVVMTestApp/LayoutInitializer.cs | 8 ++++---- source/MVVMTestApp/MVVMTestApp.csproj | 2 +- source/MVVMTestApp/MainWindow.xaml | 6 +++--- source/MVVMTestApp/MainWindow.xaml.cs | 8 ++++---- source/MVVMTestApp/PaneViewModel.cs | 6 +++--- source/MVVMTestApp/PanesStyleSelector.cs | 8 ++++---- source/MVVMTestApp/PanesTemplateSelector.cs | 4 ++-- 9 files changed, 31 insertions(+), 35 deletions(-) diff --git a/source/MVVMTestApp/FileStatsViewModel.cs b/source/MVVMTestApp/FileStatsViewModel.cs index defe59d9..fb74a0f8 100644 --- a/source/MVVMTestApp/FileStatsViewModel.cs +++ b/source/MVVMTestApp/FileStatsViewModel.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; -using System.Windows.Media.Imaging; -using System.Windows.Media; - -namespace AvalonDock.MVVMTestApp +namespace AvalonDock.MVVMTestApp { + using System; + using System.IO; + using System.Windows.Media.Imaging; + class FileStatsViewModel : ToolViewModel { public FileStatsViewModel() diff --git a/source/MVVMTestApp/FileViewModel.cs b/source/MVVMTestApp/FileViewModel.cs index 092ceb1a..7573e8ea 100644 --- a/source/MVVMTestApp/FileViewModel.cs +++ b/source/MVVMTestApp/FileViewModel.cs @@ -1,9 +1,9 @@ -using System.IO; -using System.Windows.Input; -using System.Windows.Media; - -namespace AvalonDock.MVVMTestApp +namespace AvalonDock.MVVMTestApp { + using System.IO; + using System.Windows.Input; + using System.Windows.Media; + class FileViewModel : PaneViewModel { static ImageSourceConverter ISC = new ImageSourceConverter(); diff --git a/source/MVVMTestApp/LayoutInitializer.cs b/source/MVVMTestApp/LayoutInitializer.cs index a695d297..99863dfa 100644 --- a/source/MVVMTestApp/LayoutInitializer.cs +++ b/source/MVVMTestApp/LayoutInitializer.cs @@ -1,8 +1,8 @@ -using System.Linq; -using Xceed.Wpf.AvalonDock.Layout; - -namespace AvalonDock.MVVMTestApp +namespace AvalonDock.MVVMTestApp { + using System.Linq; + using AvalonDock.Layout; + class LayoutInitializer : ILayoutUpdateStrategy { public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorableToShow, ILayoutContainer destinationContainer) diff --git a/source/MVVMTestApp/MVVMTestApp.csproj b/source/MVVMTestApp/MVVMTestApp.csproj index 0b661394..d0cc3ffd 100644 --- a/source/MVVMTestApp/MVVMTestApp.csproj +++ b/source/MVVMTestApp/MVVMTestApp.csproj @@ -12,7 +12,7 @@ - + diff --git a/source/MVVMTestApp/MainWindow.xaml b/source/MVVMTestApp/MainWindow.xaml index aa41183b..c7077683 100644 --- a/source/MVVMTestApp/MainWindow.xaml +++ b/source/MVVMTestApp/MainWindow.xaml @@ -1,9 +1,9 @@  /// Interaction logic for MainWindow.xaml /// @@ -36,7 +36,7 @@ public MainWindow() void MainWindow_Loaded(object sender, RoutedEventArgs e) { - var serializer = new Xceed.Wpf.AvalonDock.Layout.Serialization.XmlLayoutSerializer(dockManager); + var serializer = new AvalonDock.Layout.Serialization.XmlLayoutSerializer(dockManager); serializer.LayoutSerializationCallback += (s, args) => { args.Content = args.Content; @@ -48,7 +48,7 @@ void MainWindow_Loaded(object sender, RoutedEventArgs e) void MainWindow_Unloaded(object sender, RoutedEventArgs e) { - var serializer = new Xceed.Wpf.AvalonDock.Layout.Serialization.XmlLayoutSerializer(dockManager); + var serializer = new AvalonDock.Layout.Serialization.XmlLayoutSerializer(dockManager); serializer.Serialize(@".\AvalonDock.config"); } diff --git a/source/MVVMTestApp/PaneViewModel.cs b/source/MVVMTestApp/PaneViewModel.cs index 6d141ccf..d7b56513 100644 --- a/source/MVVMTestApp/PaneViewModel.cs +++ b/source/MVVMTestApp/PaneViewModel.cs @@ -1,7 +1,7 @@ -using System.Windows.Media; - -namespace AvalonDock.MVVMTestApp +namespace AvalonDock.MVVMTestApp { + using System.Windows.Media; + class PaneViewModel : ViewModelBase { public PaneViewModel() diff --git a/source/MVVMTestApp/PanesStyleSelector.cs b/source/MVVMTestApp/PanesStyleSelector.cs index a65517d7..c9a9e1c6 100644 --- a/source/MVVMTestApp/PanesStyleSelector.cs +++ b/source/MVVMTestApp/PanesStyleSelector.cs @@ -1,8 +1,8 @@ -using System.Windows.Controls; -using System.Windows; - -namespace AvalonDock.MVVMTestApp +namespace AvalonDock.MVVMTestApp { + using System.Windows.Controls; + using System.Windows; + class PanesStyleSelector : StyleSelector { public Style ToolStyle diff --git a/source/MVVMTestApp/PanesTemplateSelector.cs b/source/MVVMTestApp/PanesTemplateSelector.cs index 5c9475a0..a5de3d72 100644 --- a/source/MVVMTestApp/PanesTemplateSelector.cs +++ b/source/MVVMTestApp/PanesTemplateSelector.cs @@ -1,9 +1,9 @@ using System.Windows.Controls; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; - namespace AvalonDock.MVVMTestApp { + using AvalonDock.Layout; + class PanesTemplateSelector : DataTemplateSelector { public PanesTemplateSelector() From 1f8d8c73866574868223abeaac192a9842437711 Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 14:24:28 +0100 Subject: [PATCH 03/13] Adjusting MLibTest/Generic Theme to AvalonDock namespace --- source/MLibTest/MLibTest/App.xaml | 1 - .../AvalonDock_Dark_LightBrushs.xaml | 5 +++- .../Converters/ActiveDocumentConverter.cs | 2 +- .../MLibTest/Demos/LayoutInitializer.cs | 2 +- .../MLibTest/Demos/PanesStyleSelector.cs | 2 +- .../MLibTest/Demos/PanesTemplateSelector.cs | 4 ++-- .../Demos/ViewModels/AD/FileViewModel.cs | 2 +- .../Demos/ViewModels/AD/PaneViewModel.cs | 2 +- .../Demos/ViewModels/AD/ToolViewModel.cs | 2 +- .../Interfaces/IWorkSpaceViewModel.cs | 2 +- .../ViewModels/Tools/ColorPickerViewModel.cs | 2 +- .../ViewModels/Tools/FileStatsViewModel.cs | 2 +- .../Demos/ViewModels/Tools/Tool1_ViewModel.cs | 2 +- .../Demos/ViewModels/Tools/Tool2_ViewModel.cs | 2 +- .../Demos/ViewModels/Tools/Tool3_ViewModel.cs | 2 +- .../Demos/ViewModels/WorkSpaceViewModel.cs | 4 ++-- source/MLibTest/MLibTest/MLibTest.csproj | 6 ++--- source/MLibTest/MLibTest/MainWindow.xaml | 8 +++---- source/MLibTest/MLibTest/MainWindow.xaml.cs | 2 +- .../ViewModels/AppLifeCycleViewModel.cs | 24 ++++++++++--------- 20 files changed, 41 insertions(+), 37 deletions(-) diff --git a/source/MLibTest/MLibTest/App.xaml b/source/MLibTest/MLibTest/App.xaml index ad36c85c..3fee1866 100644 --- a/source/MLibTest/MLibTest/App.xaml +++ b/source/MLibTest/MLibTest/App.xaml @@ -2,7 +2,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Startup="Application_Startup" - xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock" > diff --git a/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml b/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml index 6ca92abd..6f7e8b62 100644 --- a/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml +++ b/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml @@ -3,10 +3,13 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" - xmlns:reskeys="clr-namespace:Xceed.Wpf.AvalonDock.Themes.VS2013.Themes;assembly=Xceed.Wpf.AvalonDock.Themes.VS2013" + xmlns:reskeys="clr-namespace:AvalonDock.Themes;assembly=AvalonDock" xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib" > + /// Implements a for AvalonDock's documents and toolwindows. diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/AD/FileViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/AD/FileViewModel.cs index 272ce5c6..d5556930 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/AD/FileViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/AD/FileViewModel.cs @@ -1,4 +1,4 @@ -namespace AvalonDock.MVVMTestApp +namespace MLibTest.Demos.ViewModels.AD { using MLibTest.Demos.ViewModels.Interfaces; using MLibTest.ViewModels.Base; diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/AD/PaneViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/AD/PaneViewModel.cs index 8ae354d5..5d248d20 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/AD/PaneViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/AD/PaneViewModel.cs @@ -1,4 +1,4 @@ -namespace AvalonDock.MVVMTestApp +namespace MLibTest.Demos.ViewModels.AD { using MLibTest.ViewModels.Base; using System.Windows.Media; diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/AD/ToolViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/AD/ToolViewModel.cs index cd33db55..1ceb8255 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/AD/ToolViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/AD/ToolViewModel.cs @@ -1,4 +1,4 @@ -namespace AvalonDock.MVVMTestApp +namespace MLibTest.Demos.ViewModels.AD { internal class ToolViewModel : PaneViewModel { diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Interfaces/IWorkSpaceViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Interfaces/IWorkSpaceViewModel.cs index 1203e2c2..9f2bc941 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Interfaces/IWorkSpaceViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Interfaces/IWorkSpaceViewModel.cs @@ -1,6 +1,6 @@ namespace MLibTest.Demos.ViewModels.Interfaces { - using AvalonDock.MVVMTestApp; + using MLibTest.Demos.ViewModels.AD; using System; using System.Collections.Generic; diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs index 53526698..65daf3d7 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs @@ -8,7 +8,7 @@ using MLibTest.ViewModels.Base; using MLib.Interfaces; using Settings.Interfaces; - using AvalonDock.MVVMTestApp; + using MLibTest.Demos.ViewModels.AD; /// /// Implements the viewmodel that drives the view a Color Picker tool window. diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/FileStatsViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/FileStatsViewModel.cs index 139c31f7..721f17c9 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/FileStatsViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/FileStatsViewModel.cs @@ -1,6 +1,6 @@ namespace AvalonDock.Tools { - using AvalonDock.MVVMTestApp; + using MLibTest.Demos.ViewModels.AD; using MLibTest.Demos.ViewModels.Interfaces; using System; using System.IO; diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs index 0c9bf43f..83055ce1 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs @@ -8,7 +8,7 @@ using MLibTest.ViewModels.Base; using MLib.Interfaces; using Settings.Interfaces; - using AvalonDock.MVVMTestApp; + using MLibTest.Demos.ViewModels.AD; /// /// Implements the viewmodel that drives a sample tool window view. diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs index 36c9e751..615dacbe 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs @@ -8,7 +8,7 @@ using MLibTest.ViewModels.Base; using MLib.Interfaces; using Settings.Interfaces; - using AvalonDock.MVVMTestApp; + using MLibTest.Demos.ViewModels.AD; /// /// Implements the viewmodel that drives a sample tool window view. diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs index ef5bfd32..01477334 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs @@ -8,7 +8,7 @@ using MLibTest.ViewModels.Base; using MLib.Interfaces; using Settings.Interfaces; - using AvalonDock.MVVMTestApp; + using MLibTest.Demos.ViewModels.AD; /// /// Implements the viewmodel that drives a sample tool window view. diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs index 9200c87f..89633a11 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs @@ -1,9 +1,9 @@ namespace MLibTest.Demos.ViewModels { - using AvalonDock.MVVMTestApp; using AvalonDock.Tools; using Microsoft.Win32; - using MLibTest.Demos.ViewModels.Interfaces; + using MLibTest.Demos.ViewModels.AD; + using MLibTest.Demos.ViewModels.Interfaces; using MLibTest.ViewModels.Base; using MWindowInterfacesLib.MsgBox.Enums; using System; diff --git a/source/MLibTest/MLibTest/MLibTest.csproj b/source/MLibTest/MLibTest/MLibTest.csproj index 8db08e43..39a4d1f3 100644 --- a/source/MLibTest/MLibTest/MLibTest.csproj +++ b/source/MLibTest/MLibTest/MLibTest.csproj @@ -24,10 +24,10 @@ - + + diff --git a/source/MLibTest/MLibTest/MainWindow.xaml b/source/MLibTest/MLibTest/MainWindow.xaml index 7754443c..19631268 100644 --- a/source/MLibTest/MLibTest/MainWindow.xaml +++ b/source/MLibTest/MLibTest/MainWindow.xaml @@ -8,16 +8,16 @@ xmlns:MWindow="clr-namespace:MWindowLib;assembly=MWindowLib" xmlns:demos="clr-namespace:MLibTest.Demos" xmlns:demoviews="clr-namespace:MLibTest.Demos.Views" - xmlns:advConv="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock" + xmlns:advConv="clr-namespace:AvalonDock.Converters;assembly=AvalonDock" mc:Ignorable="d" Title="MainWindow" Height="450" Width="800"> diff --git a/source/MLibTest/MLibTest/MainWindow.xaml.cs b/source/MLibTest/MLibTest/MainWindow.xaml.cs index 3ba62264..1dea818e 100644 --- a/source/MLibTest/MLibTest/MainWindow.xaml.cs +++ b/source/MLibTest/MLibTest/MainWindow.xaml.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Windows; using System.Windows.Input; - using Xceed.Wpf.AvalonDock.Layout.Serialization; + using AvalonDock.Layout.Serialization; /// /// Interaction logic for MainWindow.xaml diff --git a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs index 47511be7..fff34c83 100644 --- a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs +++ b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs @@ -120,14 +120,14 @@ private void CreateDefaultsSettings(ISettingsManager settings { settings.Themes.RemoveAllThemeInfos(); settings.Themes.AddThemeInfo("Generic", new List { }); - settings.Themes.AddThemeInfo("VS 2013 Blue", new List { }); - settings.Themes.AddThemeInfo("VS 2013 Dark", new List { }); - settings.Themes.AddThemeInfo("VS 2013 Light", new List { }); - - settings.Themes.AddThemeInfo("Metro", new List { }); - - settings.Themes.AddThemeInfo("Expression Dark", new List { }); - settings.Themes.AddThemeInfo("Expression Light", new List { }); +//// settings.Themes.AddThemeInfo("VS 2013 Blue", new List { }); +//// settings.Themes.AddThemeInfo("VS 2013 Dark", new List { }); +//// settings.Themes.AddThemeInfo("VS 2013 Light", new List { }); +//// +//// settings.Themes.AddThemeInfo("Metro", new List { }); +//// +//// settings.Themes.AddThemeInfo("Expression Dark", new List { }); +//// settings.Themes.AddThemeInfo("Expression Light", new List { }); try { @@ -137,7 +137,7 @@ private void CreateDefaultsSettings(ISettingsManager settings appearance.AddThemeResources("Generic", new List { new Uri("/MWindowLib;component/Themes/Generic.xaml", UriKind.RelativeOrAbsolute) - ,new Uri("/Xceed.Wpf.AvalonDock;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute) + ,new Uri("/AvalonDock;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MLib;component/Themes/Generic.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MLibTest;component/BindToMLib/MWindowLib_DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute) @@ -148,7 +148,7 @@ private void CreateDefaultsSettings(ISettingsManager settings { Debug.WriteLine(exp); } - +/*** try { // Adding Generic theme (which is really based on Light theme in MLib) @@ -284,8 +284,10 @@ private void CreateDefaultsSettings(ISettingsManager settings { Debug.WriteLine(exp); } +***/ - appearance.SetDefaultTheme(settings.Themes, "VS 2013 Dark"); +//// appearance.SetDefaultTheme(settings.Themes, "VS 2013 Dark"); + appearance.SetDefaultTheme(settings.Themes, "Generic"); try { From f821a6806507f875ea759d1e89805fd0c917f2a4 Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 15:09:26 +0100 Subject: [PATCH 04/13] Adjusted AvalonDock.Themes.2013 and MLibTest for the AvalonDock namespace --- source/AvalonDock.sln | 2 +- source/CleanAll.bat | 2 +- ...csproj => AvalonDock.Themes.VS2013.csproj} | 70 +++++++++---------- .../BlueBrushs.xaml | 2 +- .../BlueTheme.xaml | 4 +- .../DarkBrushs.xaml | 4 +- .../DarkTheme.xaml | 4 +- .../LightBrushs.xaml | 4 +- .../LightTheme.xaml | 4 +- .../OverlayButtons.xaml | 2 +- .../Properties/AssemblyInfo.cs | 13 ++-- .../Themes/Generic.xaml | 42 +++++------ .../Themes/Menu/DarkBrushs.xaml | 2 +- .../Themes/Menu/LightBrushs.xaml | 2 +- .../Themes/Menu/MenuItem.xaml | 4 +- .../Themes/Menu/MenuKeys.cs | 2 +- .../Themes/ResourceKeys.cs | 2 +- .../Vs2013BlueTheme.cs | 4 +- .../Vs2013DarkTheme.cs | 4 +- .../Vs2013LightTheme.cs | 4 +- .../AvalonDock_Dark_LightBrushs.xaml | 5 +- source/MLibTest/MLibTest/MLibTest.csproj | 4 +- .../ViewModels/AppLifeCycleViewModel.cs | 25 ++++--- 23 files changed, 103 insertions(+), 108 deletions(-) rename source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/{Xceed.Wpf.AvalonDock.Themes.VS2013.csproj => AvalonDock.Themes.VS2013.csproj} (86%) diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln index 060457da..3584cb93 100644 --- a/source/AvalonDock.sln +++ b/source/AvalonDock.sln @@ -14,7 +14,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.VS2013", "Components\Xceed.Wpf.AvalonDock.Themes.VS2013\Xceed.Wpf.AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2013", "Components\Xceed.Wpf.AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MLibTest_Components", "MLibTest_Components", "{72045D3A-A982-4C69-8FB8-6B601363D7ED}" EndProject diff --git a/source/CleanAll.bat b/source/CleanAll.bat index 6c6a49d0..6a535fbb 100644 --- a/source/CleanAll.bat +++ b/source/CleanAll.bat @@ -32,7 +32,7 @@ ECHO XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ECHO. ECHO Removing vs settings folder with *.sou file ECHO. -RMDIR /S /Q .vs +ECHO RMDIR /S /Q .vs ECHO Deleting BIN and OBJ Folders in MLibTest ECHO. diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj similarity index 86% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj rename to source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj index 3b78f1e3..0eed216d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj @@ -1,35 +1,35 @@ - - - Xceed.Wpf.AvalonDock.Themes - netcoreapp3.0;net4 - true - sn.snk - true - true - 4.00 - 4.00 - 4.00 - Open Source - Dirkster.AvalonDock - 2017-2019 - This assembly implements a docking layout system for WPF. - https://github.com/Dirkster99/AvalonDock - https://github.com/Dirkster99/AvalonDock - Dirkster.AvalonDock.Themes.VS2013 - https://github.com/Dirkster99/AvalonDock - LICENSE.txt - - - - - - - - - - - - - - - + + + AvalonDock.Themes + netcoreapp3.0;net4 + true + sn.snk + true + true + 4.00 + 4.00 + 4.00 + Open Source + Dirkster.AvalonDock + 2017-2019 + This assembly implements a docking layout system for WPF. + https://github.com/Dirkster99/AvalonDock + https://github.com/Dirkster99/AvalonDock + Dirkster.AvalonDock.Themes.VS2013 + https://github.com/Dirkster99/AvalonDock + LICENSE.txt + + + + + + + + + + + + + + + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueBrushs.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueBrushs.xaml index ec01e779..854f5092 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueBrushs.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueBrushs.xaml @@ -1,6 +1,6 @@  diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml index 18eaea01..a8769294 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml @@ -1,8 +1,8 @@  - - + + \ No newline at end of file diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkBrushs.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkBrushs.xaml index 83cd6bd9..94331b71 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkBrushs.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkBrushs.xaml @@ -1,10 +1,10 @@  - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml index e24f2b98..57811622 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml @@ -1,8 +1,8 @@  - - + + \ No newline at end of file diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightBrushs.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightBrushs.xaml index 4a32678d..07f7ca3b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightBrushs.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightBrushs.xaml @@ -1,10 +1,10 @@  - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml index 5dde1b0b..a68e7c01 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml @@ -1,8 +1,8 @@  - - + + \ No newline at end of file diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/OverlayButtons.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/OverlayButtons.xaml index e59409c6..db4f0676 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/OverlayButtons.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/OverlayButtons.xaml @@ -1,6 +1,6 @@  diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs index 03eecf29..8f95e0d2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs @@ -14,7 +14,6 @@ This program is provided to you under the terms of the New BSD **********************************************************************/ -using System.Reflection; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; @@ -24,7 +23,7 @@ This program is provided to you under the terms of the New BSD // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -[assembly: CLSCompliant( true )] +[assembly: CLSCompliant(true)] //In order to begin building localizable applications, set //CultureYouAreCodingWith in your .csproj file @@ -38,12 +37,12 @@ This program is provided to you under the terms of the New BSD [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) + //(used if a resource is not found in the page, + // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )] +[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes")] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml index da0e7b90..0b1c35b3 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml @@ -19,16 +19,16 @@ - - + + @@ -151,7 +151,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonDefaultGlyph}}" Width="12" Height="12"> - + @@ -532,7 +532,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}" Width="13" Height="13"> - + @@ -554,7 +554,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}" Width="13" Height="13"> - + @@ -575,7 +575,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}" Width="13" Height="13"> - + @@ -1446,7 +1446,7 @@ - + @@ -1716,7 +1716,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -1738,7 +1738,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -1760,7 +1760,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -1783,7 +1783,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -2048,7 +2048,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -2072,7 +2072,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -2094,7 +2094,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -2117,7 +2117,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml index 4a14914b..bbc08fa8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" - xmlns:reskeys="clr-namespace:Xceed.Wpf.AvalonDock.Themes.VS2013.Themes" + xmlns:reskeys="clr-namespace:AvalonDock.Themes.VS2013.Themes" > diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs index 0dfa80a5..efe121de 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs @@ -1,4 +1,4 @@ -namespace Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.Menu +namespace AvalonDock.Themes.VS2013.Themes.Menu { using System.Windows; diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs index 280615e4..6afe1452 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs @@ -1,4 +1,4 @@ -namespace Xceed.Wpf.AvalonDock.Themes.VS2013.Themes +namespace AvalonDock.Themes.VS2013.Themes { using System.Windows; diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs index a9892eb7..e11a9f1c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs @@ -16,14 +16,14 @@ This program is provided to you under the terms of the New BSD using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class Vs2013BlueTheme : Theme { public override Uri GetResourceUri() { return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.VS2013;component/BlueTheme.xaml", + "/AvalonDock.Themes.VS2013;component/BlueTheme.xaml", UriKind.Relative); } } diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs index 22d2788c..ce816ab7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs @@ -16,14 +16,14 @@ This program is provided to you under the terms of the New BSD using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class Vs2013DarkTheme : Theme { public override Uri GetResourceUri() { return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.VS2013;component/DarkTheme.xaml", + "/AvalonDock.Themes.VS2013;component/DarkTheme.xaml", UriKind.Relative); } } diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013LightTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013LightTheme.cs index 5a7f3c4b..f18ff285 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013LightTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013LightTheme.cs @@ -16,14 +16,14 @@ This program is provided to you under the terms of the New BSD using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class Vs2013LightTheme : Theme { public override Uri GetResourceUri() { return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.VS2013;component/LightTheme.xaml", + "/AvalonDock.Themes.VS2013;component/LightTheme.xaml", UriKind.Relative); } } diff --git a/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml b/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml index 6f7e8b62..8b848ae3 100644 --- a/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml +++ b/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml @@ -3,13 +3,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" - xmlns:reskeys="clr-namespace:AvalonDock.Themes;assembly=AvalonDock" + xmlns:reskeys="clr-namespace:AvalonDock.Themes.VS2013.Themes;assembly=AvalonDock.Themes.VS2013" xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib" > - + + diff --git a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs index fff34c83..621f9f65 100644 --- a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs +++ b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs @@ -120,9 +120,9 @@ private void CreateDefaultsSettings(ISettingsManager settings { settings.Themes.RemoveAllThemeInfos(); settings.Themes.AddThemeInfo("Generic", new List { }); -//// settings.Themes.AddThemeInfo("VS 2013 Blue", new List { }); -//// settings.Themes.AddThemeInfo("VS 2013 Dark", new List { }); -//// settings.Themes.AddThemeInfo("VS 2013 Light", new List { }); + settings.Themes.AddThemeInfo("VS 2013 Blue", new List { }); + settings.Themes.AddThemeInfo("VS 2013 Dark", new List { }); + settings.Themes.AddThemeInfo("VS 2013 Light", new List { }); //// //// settings.Themes.AddThemeInfo("Metro", new List { }); //// @@ -148,7 +148,7 @@ private void CreateDefaultsSettings(ISettingsManager settings { Debug.WriteLine(exp); } -/*** + try { // Adding Generic theme (which is really based on Light theme in MLib) @@ -156,8 +156,8 @@ private void CreateDefaultsSettings(ISettingsManager settings // so this is how it can be tested ... appearance.AddThemeResources("VS 2013 Blue", new List { - new Uri("/Xceed.Wpf.AvalonDock.Themes.VS2013;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute) - ,new Uri("/Xceed.Wpf.AvalonDock.Themes.VS2013;component/BlueBrushs.xaml", UriKind.RelativeOrAbsolute) + new Uri("/AvalonDock.Themes.VS2013;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute) + ,new Uri("/AvalonDock.Themes.VS2013;component/BlueBrushs.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MLib;component/Themes/Generic.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MWindowLib;component/Themes/Generic.xaml", UriKind.RelativeOrAbsolute) @@ -177,8 +177,8 @@ private void CreateDefaultsSettings(ISettingsManager settings // Add additional Dark and Light resources to those theme resources added above appearance.AddThemeResources("VS 2013 Dark", new List { - new Uri("/Xceed.Wpf.AvalonDock.Themes.VS2013;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute) - ,new Uri("/Xceed.Wpf.AvalonDock.Themes.VS2013;component/DarkBrushs.xaml", UriKind.RelativeOrAbsolute) + new Uri("/AvalonDock.Themes.VS2013;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute) + ,new Uri("/AvalonDock.Themes.VS2013;component/DarkBrushs.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/ColorPickerLib;component/Themes/DarkBrushs.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/NumericUpDownLib;component/Themes/DarkBrushs.xaml", UriKind.RelativeOrAbsolute) @@ -201,8 +201,8 @@ private void CreateDefaultsSettings(ISettingsManager settings { appearance.AddThemeResources("VS 2013 Light", new List { - new Uri("/Xceed.Wpf.AvalonDock.Themes.VS2013;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute) - ,new Uri("/Xceed.Wpf.AvalonDock.Themes.VS2013;component/LightBrushs.xaml", UriKind.RelativeOrAbsolute) + new Uri("/AvalonDock.Themes.VS2013;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute) + ,new Uri("/AvalonDock.Themes.VS2013;component/LightBrushs.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/ColorPickerLib;component/Themes/LightBrushs.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/NumericUpDownLib;component/Themes/LightBrushs.xaml", UriKind.RelativeOrAbsolute) @@ -220,7 +220,7 @@ private void CreateDefaultsSettings(ISettingsManager settings { Debug.WriteLine(exp); } - +/*** try { // Adding Generic theme (which is really based on Light theme in MLib) @@ -286,8 +286,7 @@ private void CreateDefaultsSettings(ISettingsManager settings } ***/ -//// appearance.SetDefaultTheme(settings.Themes, "VS 2013 Dark"); - appearance.SetDefaultTheme(settings.Themes, "Generic"); + appearance.SetDefaultTheme(settings.Themes, "VS 2013 Dark"); try { From 682c05f7458121d8e5af6e2e592694c51d736eea Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 15:24:08 +0100 Subject: [PATCH 05/13] Adjusted Metro Theme and MLibTest for AvalonDock namespace --- source/AvalonDock.sln | 2 +- ....csproj => AvalonDock.Themes.Metro.csproj} | 70 +++++++++---------- .../MetroTheme.cs | 4 +- .../Properties/AssemblyInfo.cs | 2 +- .../Theme.xaml | 14 ++-- source/MLibTest/MLibTest/MLibTest.csproj | 4 +- .../ViewModels/AppLifeCycleViewModel.cs | 10 +-- 7 files changed, 53 insertions(+), 53 deletions(-) rename source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/{Xceed.Wpf.AvalonDock.Themes.Metro.csproj => AvalonDock.Themes.Metro.csproj} (86%) diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln index 3584cb93..1fb0e8e7 100644 --- a/source/AvalonDock.sln +++ b/source/AvalonDock.sln @@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock", "Components\Xc EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2013", "Components\Xceed.Wpf.AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}" EndProject diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj similarity index 86% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj rename to source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj index 7fd00f85..f5ca08d0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj @@ -1,35 +1,35 @@ - - - Xceed.Wpf.AvalonDock.Themes - netcoreapp3.0;net4 - true - sn.snk - true - true - 4.00 - 4.00 - 4.00 - Open Source - Dirkster.AvalonDock - 2017-2019 - This assembly implements a docking layout system for WPF. - https://github.com/Dirkster99/AvalonDock - https://github.com/Dirkster99/AvalonDock - Dirkster.AvalonDock.Themes.Metro - https://github.com/Dirkster99/AvalonDock - LICENSE.txt - - - - - - - - - - - - - - - + + + AvalonDock.Themes.Metro + netcoreapp3.0;net4 + true + sn.snk + true + true + 4.00 + 4.00 + 4.00 + Open Source + Dirkster.AvalonDock + 2017-2019 + This assembly implements a docking layout system for WPF. + https://github.com/Dirkster99/AvalonDock + https://github.com/Dirkster99/AvalonDock + Dirkster.AvalonDock.Themes.Metro + https://github.com/Dirkster99/AvalonDock + LICENSE.txt + + + + + + + + + + + + + + + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs index 95e47d26..1ff45eec 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs @@ -16,14 +16,14 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class MetroTheme : Theme { public override Uri GetResourceUri() { return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.Metro;component/Theme.xaml", + "/AvalonDock.Themes.Metro;component/Theme.xaml", UriKind.Relative); } } diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs index d7e10097..ef9b267c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs @@ -48,4 +48,4 @@ This program is provided to you under the terms of the Microsoft Public )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )] +[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml index ac3a1a05..0d7c8330 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml @@ -16,13 +16,13 @@ + xmlns:localThemes="clr-namespace:AvalonDock.Themes" + xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=AvalonDock" + xmlns:avalonDock="clr-namespace:AvalonDock;assembly=AvalonDock" + xmlns:avalonDockLayout="clr-namespace:AvalonDock.Layout;assembly=AvalonDock" + xmlns:avalonDockControls="clr-namespace:AvalonDock.Controls;assembly=AvalonDock" + xmlns:avalonDockConverters="clr-namespace:AvalonDock.Converters;assembly=AvalonDock" + xmlns:avalonDockProperties="clr-namespace:AvalonDock.Properties;assembly=AvalonDock"> diff --git a/source/MLibTest/MLibTest/MLibTest.csproj b/source/MLibTest/MLibTest/MLibTest.csproj index 16d9ea56..9eb640a1 100644 --- a/source/MLibTest/MLibTest/MLibTest.csproj +++ b/source/MLibTest/MLibTest/MLibTest.csproj @@ -24,8 +24,8 @@ - + + diff --git a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs index 621f9f65..a7a3c5ae 100644 --- a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs +++ b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs @@ -123,8 +123,8 @@ private void CreateDefaultsSettings(ISettingsManager settings settings.Themes.AddThemeInfo("VS 2013 Blue", new List { }); settings.Themes.AddThemeInfo("VS 2013 Dark", new List { }); settings.Themes.AddThemeInfo("VS 2013 Light", new List { }); -//// -//// settings.Themes.AddThemeInfo("Metro", new List { }); + + settings.Themes.AddThemeInfo("Metro", new List { }); //// //// settings.Themes.AddThemeInfo("Expression Dark", new List { }); //// settings.Themes.AddThemeInfo("Expression Light", new List { }); @@ -220,7 +220,7 @@ private void CreateDefaultsSettings(ISettingsManager settings { Debug.WriteLine(exp); } -/*** + try { // Adding Generic theme (which is really based on Light theme in MLib) @@ -231,7 +231,7 @@ private void CreateDefaultsSettings(ISettingsManager settings new Uri("/MLib;component/Themes/Generic.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MWindowLib;component/Themes/Generic.xaml", UriKind.RelativeOrAbsolute) - ,new Uri("/Xceed.Wpf.AvalonDock.Themes.Metro;component/Theme.xaml", UriKind.RelativeOrAbsolute) + ,new Uri("/AvalonDock.Themes.Metro;component/Theme.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MLibTest;component/BindToMLib/MWindowLib_DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute) }, settings.Themes); @@ -240,7 +240,7 @@ private void CreateDefaultsSettings(ISettingsManager settings { Debug.WriteLine(exp); } - +/*** try { // Adding Generic theme (which is really based on Light theme in MLib) From accf6c2851f9467f1eb3c6ed696c68a044809f38 Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 15:27:17 +0100 Subject: [PATCH 06/13] Adjusted Metro Root namespace to AvalonDock.Themes --- .../AvalonDock.Themes.Metro.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj index f5ca08d0..5143bff9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj @@ -1,6 +1,6 @@  - AvalonDock.Themes.Metro + AvalonDock.Themes netcoreapp3.0;net4 true sn.snk From 9d9e993d1929a36d71214b98d8b629239f408f36 Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 15:50:34 +0100 Subject: [PATCH 07/13] Expression Theme and MLibTest adjusted for AvalonDock namespace --- source/AvalonDock.sln | 2 +- ...oj => AvalonDock.Themes.Expression.csproj} | 70 ++++++++-------- .../Controls/SplineBorder.cs | 2 +- .../ExpressionDarkTheme.cs | 4 +- .../ExpressionLightTheme.cs | 4 +- .../Properties/AssemblyInfo.cs | 2 +- .../Theme.xaml | 84 +++++++++---------- source/MLibTest/MLibTest/MLibTest.csproj | 2 +- .../ViewModels/AppLifeCycleViewModel.cs | 13 ++- 9 files changed, 91 insertions(+), 92 deletions(-) rename source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/{Xceed.Wpf.AvalonDock.Themes.Expression.csproj => AvalonDock.Themes.Expression.csproj} (86%) diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln index 1fb0e8e7..4afa33ec 100644 --- a/source/AvalonDock.sln +++ b/source/AvalonDock.sln @@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AvalonDock", "AvalonDock", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock", "Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}" EndProject diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Xceed.Wpf.AvalonDock.Themes.Expression.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj similarity index 86% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Xceed.Wpf.AvalonDock.Themes.Expression.csproj rename to source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj index 346c1c44..663715f2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Xceed.Wpf.AvalonDock.Themes.Expression.csproj +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj @@ -1,35 +1,35 @@ - - - Xceed.Wpf.AvalonDock.Themes - netcoreapp3.0;net4 - true - sn.snk - true - true - 4.00 - 4.00 - 4.00 - Open Source - Dirkster.AvalonDock - 2017-2019 - This assembly implements a docking layout system for WPF. - https://github.com/Dirkster99/AvalonDock - https://github.com/Dirkster99/AvalonDock - Dirkster.AvalonDock.Themes.Expression - https://github.com/Dirkster99/AvalonDock - LICENSE.txt - - - - - - - - - - - - - - - + + + AvalonDock.Themes + netcoreapp3.0;net4 + true + sn.snk + true + true + 4.00 + 4.00 + 4.00 + Open Source + Dirkster.AvalonDock + 2017-2019 + This assembly implements a docking layout system for WPF. + https://github.com/Dirkster99/AvalonDock + https://github.com/Dirkster99/AvalonDock + Dirkster.AvalonDock.Themes.Expression + https://github.com/Dirkster99/AvalonDock + LICENSE.txt + + + + + + + + + + + + + + + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Controls/SplineBorder.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Controls/SplineBorder.cs index a2603b3e..b7874278 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Controls/SplineBorder.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Controls/SplineBorder.cs @@ -18,7 +18,7 @@ This program is provided to you under the terms of the New BSD using System.Windows.Controls; using System.Windows.Media; -namespace Xceed.Wpf.AvalonDock.Themes.Controls +namespace AvalonDock.Themes.Controls { public class SplineBorder : Control { diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs index 255b8493..a678b1fb 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs @@ -16,14 +16,14 @@ This program is provided to you under the terms of the New BSD using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class ExpressionDarkTheme : Theme { public override Uri GetResourceUri() { return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.Expression;component/DarkTheme.xaml", + "/AvalonDock.Themes.Expression;component/DarkTheme.xaml", UriKind.Relative); } } diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs index 024b87d1..c54d9213 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs @@ -16,14 +16,14 @@ This program is provided to you under the terms of the New BSD using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class ExpressionLightTheme : Theme { public override Uri GetResourceUri() { return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.Expression;component/LightTheme.xaml", + "/AvalonDock.Themes.Expression;component/LightTheme.xaml", UriKind.Relative); } } diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs index 065754a0..bb9cfdea 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs @@ -48,4 +48,4 @@ This program is provided to you under the terms of the New BSD )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )] +[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml index 0d14c6e1..25158786 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml @@ -17,15 +17,15 @@ @@ -117,7 +117,7 @@ - + - + - + @@ -388,7 +388,7 @@ DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}" DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"> - + @@ -430,16 +430,16 @@ - + - + - + - + @@ -750,7 +750,7 @@ Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"> + Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png"/> @@ -766,7 +766,7 @@ - + @@ -807,7 +807,7 @@ Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"> - + @@ -821,7 +821,7 @@ - + @@ -916,7 +916,7 @@ DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}" DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}"> - + @@ -972,19 +972,19 @@ Value="{DynamicResource AvalonDock_Expression_BaseColor10}" /> - + - + - + - + - + @@ -1043,7 +1043,7 @@ ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}" Grid.Column="2" Panel.ZIndex="100"> - + @@ -1067,10 +1067,10 @@ - + - + @@ -1114,7 +1114,7 @@ DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}" DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"> - + @@ -1186,16 +1186,16 @@ - + - + - + - + diff --git a/source/MLibTest/MLibTest/MLibTest.csproj b/source/MLibTest/MLibTest/MLibTest.csproj index 9eb640a1..a75a90d9 100644 --- a/source/MLibTest/MLibTest/MLibTest.csproj +++ b/source/MLibTest/MLibTest/MLibTest.csproj @@ -24,7 +24,7 @@ - + diff --git a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs index a7a3c5ae..b4a372d6 100644 --- a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs +++ b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs @@ -125,9 +125,9 @@ private void CreateDefaultsSettings(ISettingsManager settings settings.Themes.AddThemeInfo("VS 2013 Light", new List { }); settings.Themes.AddThemeInfo("Metro", new List { }); -//// -//// settings.Themes.AddThemeInfo("Expression Dark", new List { }); -//// settings.Themes.AddThemeInfo("Expression Light", new List { }); + + settings.Themes.AddThemeInfo("Expression Dark", new List { }); + settings.Themes.AddThemeInfo("Expression Light", new List { }); try { @@ -240,7 +240,7 @@ private void CreateDefaultsSettings(ISettingsManager settings { Debug.WriteLine(exp); } -/*** + try { // Adding Generic theme (which is really based on Light theme in MLib) @@ -251,7 +251,7 @@ private void CreateDefaultsSettings(ISettingsManager settings new Uri("/MLib;component/Themes/LightTheme.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MWindowLib;component/Themes/Generic.xaml", UriKind.RelativeOrAbsolute) - ,new Uri("/Xceed.Wpf.AvalonDock.Themes.Expression;component/LightTheme.xaml", UriKind.RelativeOrAbsolute) + ,new Uri("/AvalonDock.Themes.Expression;component/LightTheme.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MLibTest;component/BindToMLib/MWindowLib_DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute) }, settings.Themes); @@ -273,7 +273,7 @@ private void CreateDefaultsSettings(ISettingsManager settings ,new Uri("/ColorPickerLib;component/Themes/DarkBrushs.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/NumericUpDownLib;component/Themes/DarkBrushs.xaml", UriKind.RelativeOrAbsolute) - ,new Uri("/Xceed.Wpf.AvalonDock.Themes.Expression;component/DarkTheme.xaml", UriKind.RelativeOrAbsolute) + ,new Uri("/AvalonDock.Themes.Expression;component/DarkTheme.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MLibTest;component/BindToMLib/MWindowLib_DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MLibTest;component/BindToMLib/ColorPickerLib_DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute) ,new Uri("/MLibTest;component/BindToMLib/NumericUpDownLib_DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute) @@ -284,7 +284,6 @@ private void CreateDefaultsSettings(ISettingsManager settings { Debug.WriteLine(exp); } -***/ appearance.SetDefaultTheme(settings.Themes, "VS 2013 Dark"); From 82ed8e89cf0b33e1af243dc0c65c90d37437185f Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 16:23:59 +0100 Subject: [PATCH 08/13] Adjusted Winforms Test App and VS2010, Aero themes for AvalonDock namespaces --- source/AvalonDock.sln | 4 +- .../AeroColors.cs | 2 +- .../AeroTheme.cs | 4 +- ...o.csproj => AvalonDock.Themes.Aero.csproj} | 70 +++++++++---------- .../Brushes.xaml | 4 +- .../Controls/SplineBorder.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Theme.xaml | 18 ++--- ...csproj => AvalonDock.Themes.VS2010.csproj} | 70 +++++++++---------- .../Properties/AssemblyInfo.cs | 2 +- .../Theme.xaml | 14 ++-- .../VS2010Theme.cs | 4 +- source/WinFormsTestApp/FormMain.cs | 24 +++---- source/WinFormsTestApp/WinFormsTestApp.csproj | 12 ++-- 14 files changed, 115 insertions(+), 117 deletions(-) rename source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/{Xceed.Wpf.AvalonDock.Themes.Aero.csproj => AvalonDock.Themes.Aero.csproj} (86%) rename source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/{Xceed.Wpf.AvalonDock.Themes.VS2010.csproj => AvalonDock.Themes.VS2010.csproj} (86%) diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln index 4afa33ec..65828d01 100644 --- a/source/AvalonDock.sln +++ b/source/AvalonDock.sln @@ -20,9 +20,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MLibTest_Components", "MLib EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Settings", "MLibTest\MLibTest_Components\Settings\Settings\Settings.csproj", "{2807B493-CC2E-402E-901A-EB138698FEDC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.VS2010", "Components\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2010", "Components\Xceed.Wpf.AvalonDock.Themes.VS2010\AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Aero", "Components\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Aero", "Components\Xceed.Wpf.AvalonDock.Themes.Aero\AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutomationTest", "AutomationTest", "{20876020-CC7D-46BD-9B80-E4F01FC0FD31}" EndProject diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs index 658a92ba..85a138f1 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public using System.Windows; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public static class AeroColors { diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs index 17408635..29ba1cae 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs @@ -16,14 +16,14 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class AeroTheme : Theme { public override Uri GetResourceUri() { return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.Aero;component/Theme.xaml", + "/AvalonDock.Themes.Aero;component/Theme.xaml", UriKind.Relative); } } diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj similarity index 86% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj rename to source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj index b21885c4..82254ae5 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj @@ -1,35 +1,35 @@ - - - Xceed.Wpf.AvalonDock.Themes - netcoreapp3.0;net4 - true - sn.snk - true - true - 4.00 - 4.00 - 4.00 - Open Source - Dirkster.AvalonDock - 2017-2019 - This assembly implements a docking layout system for WPF. - https://github.com/Dirkster99/AvalonDock - https://github.com/Dirkster99/AvalonDock - Dirkster.AvalonDock.Themes.Aero - https://github.com/Dirkster99/AvalonDock - LICENSE.txt - - - - - - - - - - - - - - - + + + AvalonDock.Themes + netcoreapp3.0;net4 + true + sn.snk + true + true + 4.00 + 4.00 + 4.00 + Open Source + Dirkster.AvalonDock + 2017-2019 + This assembly implements a docking layout system for WPF. + https://github.com/Dirkster99/AvalonDock + https://github.com/Dirkster99/AvalonDock + Dirkster.AvalonDock.Themes.Aero + https://github.com/Dirkster99/AvalonDock + LICENSE.txt + + + + + + + + + + + + + + + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml index 04a24fe1..bb1d16d5 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml @@ -16,9 +16,7 @@ - - + xmlns:at="clr-namespace:AvalonDock.Themes"> + xmlns:localThemes="clr-namespace:AvalonDock.Themes" + xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=AvalonDock" + xmlns:avalonDock="clr-namespace:AvalonDock;assembly=AvalonDock" + xmlns:avalonDockLayout="clr-namespace:AvalonDock.Layout;assembly=AvalonDock" + xmlns:avalonDockControls="clr-namespace:AvalonDock.Controls;assembly=AvalonDock" + xmlns:avalonDockAero="clr-namespace:AvalonDock.Themes" + xmlns:avalonDockThemeControls="clr-namespace:AvalonDock.Themes.Controls" + xmlns:avalonDockConverters="clr-namespace:AvalonDock.Converters;assembly=AvalonDock" + xmlns:avalonDockProperties="clr-namespace:AvalonDock.Properties;assembly=AvalonDock"> diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj similarity index 86% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj rename to source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj index 99df18b6..f0eba5f2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj @@ -1,35 +1,35 @@ - - - Xceed.Wpf.AvalonDock.Themes - netcoreapp3.0;net4 - true - sn.snk - true - true - 4.00 - 4.00 - 4.00 - Open Source - Dirkster.AvalonDock - 2017-2019 - This assembly implements a docking layout system for WPF. - https://github.com/Dirkster99/AvalonDock - https://github.com/Dirkster99/AvalonDock - Dirkster.AvalonDock.Themes.VS2010 - https://github.com/Dirkster99/AvalonDock - LICENSE.txt - - - - - - - - - - - - - - - + + + AvalonDock.Themes + netcoreapp3.0;net4 + true + sn.snk + true + true + 4.00 + 4.00 + 4.00 + Open Source + Dirkster.AvalonDock + 2017-2019 + This assembly implements a docking layout system for WPF. + https://github.com/Dirkster99/AvalonDock + https://github.com/Dirkster99/AvalonDock + Dirkster.AvalonDock.Themes.VS2010 + https://github.com/Dirkster99/AvalonDock + LICENSE.txt + + + + + + + + + + + + + + + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs index d7e10097..ef9b267c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs @@ -48,4 +48,4 @@ This program is provided to you under the terms of the Microsoft Public )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )] +[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml index d4985082..6563a221 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml @@ -16,13 +16,13 @@ + xmlns:localThemes="clr-namespace:AvalonDock.Themes" + xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=AvalonDock" + xmlns:avalonDock="clr-namespace:AvalonDock;assembly=AvalonDock" + xmlns:avalonDockLayout="clr-namespace:AvalonDock.Layout;assembly=AvalonDock" + xmlns:avalonDockControls="clr-namespace:AvalonDock.Controls;assembly=AvalonDock" + xmlns:avalonDockConverters="clr-namespace:AvalonDock.Converters;assembly=AvalonDock" + xmlns:avalonDockProperties="clr-namespace:AvalonDock.Properties;assembly=AvalonDock"> diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs index 64226d40..af8c43e5 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs @@ -16,14 +16,14 @@ This program is provided to you under the terms of the Microsoft Public using System; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public class VS2010Theme : Theme { public override Uri GetResourceUri() { return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Theme.xaml", + "/AvalonDock.Themes.VS2010;component/Theme.xaml", UriKind.Relative); } } diff --git a/source/WinFormsTestApp/FormMain.cs b/source/WinFormsTestApp/FormMain.cs index 82446e87..26676491 100644 --- a/source/WinFormsTestApp/FormMain.cs +++ b/source/WinFormsTestApp/FormMain.cs @@ -5,10 +5,10 @@ using System.Linq; using System.Reflection; using System.Windows.Forms; - using Xceed.Wpf.AvalonDock; - using Xceed.Wpf.AvalonDock.Layout; - using Xceed.Wpf.AvalonDock.Layout.Serialization; - using Xceed.Wpf.AvalonDock.Themes; + using AvalonDock; + using AvalonDock.Layout; + using AvalonDock.Layout.Serialization; + using AvalonDock.Themes; public partial class FormMain : Form { @@ -60,43 +60,43 @@ protected override void OnLoad(EventArgs e) private void menuItemVS2010_Click(object sender, EventArgs e) { - _dockingManager.Theme = new Xceed.Wpf.AvalonDock.Themes.VS2010Theme(); + _dockingManager.Theme = new AvalonDock.Themes.VS2010Theme(); this.SetChecked(menuItemVS2010); } private void menuItemMetro_Click(object sender, EventArgs e) { - _dockingManager.Theme = new Xceed.Wpf.AvalonDock.Themes.MetroTheme(); + _dockingManager.Theme = new AvalonDock.Themes.MetroTheme(); this.SetChecked(menuItemMetro); } private void menuItemGeneric_Click(object sender, EventArgs e) { - _dockingManager.Theme = new Xceed.Wpf.AvalonDock.Themes.GenericTheme(); + _dockingManager.Theme = new AvalonDock.Themes.GenericTheme(); this.SetChecked(menuItemGeneric); } private void menuItemExpressionDark_Click(object sender, EventArgs e) { - _dockingManager.Theme = new Xceed.Wpf.AvalonDock.Themes.ExpressionDarkTheme(); + _dockingManager.Theme = new AvalonDock.Themes.ExpressionDarkTheme(); this.SetChecked(menuItemExpressionDark); } private void menuItemExpressionLight_Click(object sender, EventArgs e) { - _dockingManager.Theme = new Xceed.Wpf.AvalonDock.Themes.ExpressionLightTheme(); + _dockingManager.Theme = new AvalonDock.Themes.ExpressionLightTheme(); this.SetChecked(menuItemExpressionLight); } private void vS2013ToolStripMenuItem_Click(object sender, EventArgs e) { - _dockingManager.Theme = new Xceed.Wpf.AvalonDock.Themes.Vs2013LightTheme(); + _dockingManager.Theme = new AvalonDock.Themes.Vs2013LightTheme(); this.SetChecked(menuItemVs2013); } private void menuItemAero_Vs2013Dark(object sender, EventArgs e) { - _dockingManager.Theme = new Xceed.Wpf.AvalonDock.Themes.Vs2013DarkTheme(); + _dockingManager.Theme = new AvalonDock.Themes.Vs2013DarkTheme(); this.SetChecked(menuItemVS2013Dark); } @@ -113,7 +113,7 @@ private void SetChecked(ToolStripMenuItem toCheck) private void menuItemAero_Click(object sender, EventArgs e) { - _dockingManager.Theme = new Xceed.Wpf.AvalonDock.Themes.AeroTheme(); + _dockingManager.Theme = new AvalonDock.Themes.AeroTheme(); this.SetChecked(menuItemAero); } } diff --git a/source/WinFormsTestApp/WinFormsTestApp.csproj b/source/WinFormsTestApp/WinFormsTestApp.csproj index d1a0c273..be8d1eac 100644 --- a/source/WinFormsTestApp/WinFormsTestApp.csproj +++ b/source/WinFormsTestApp/WinFormsTestApp.csproj @@ -13,12 +13,12 @@ - - - - - - + + + + + + From 7509eac7ca267497f5bdaa02b3b86b8101194ec1 Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 16:30:19 +0100 Subject: [PATCH 09/13] Replaced Code File Line Column http://schemas.xceed.com/wpf/xaml/avalondock with URL of this project: https://github.com/Dirkster99/AvalonDock --- .../Views/AnchorablePaneTestWindow.xaml | 2 +- ...orableFloatingWindowControlTestWindow.xaml | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 23 +++++++++---------- source/TestApp/MainWindow.xaml | 2 +- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml b/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml index 181c0ce7..2ba15d22 100644 --- a/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml +++ b/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml @@ -1,7 +1,7 @@ diff --git a/source/AutomationTest/AvalonDockTest/Views/LayoutAnchorableFloatingWindowControlTestWindow.xaml b/source/AutomationTest/AvalonDockTest/Views/LayoutAnchorableFloatingWindowControlTestWindow.xaml index ebfdd56c..6a6790be 100644 --- a/source/AutomationTest/AvalonDockTest/Views/LayoutAnchorableFloatingWindowControlTestWindow.xaml +++ b/source/AutomationTest/AvalonDockTest/Views/LayoutAnchorableFloatingWindowControlTestWindow.xaml @@ -1,7 +1,7 @@  diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs index 70261c20..65dadf05 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs @@ -48,4 +48,4 @@ This program is provided to you under the terms of the Microsoft Public )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] \ No newline at end of file +[assembly: XmlnsDefinition( "https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes" )] \ No newline at end of file diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs index bb9cfdea..c0ad3efd 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs @@ -48,4 +48,4 @@ This program is provided to you under the terms of the New BSD )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] +[assembly: XmlnsDefinition( "https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes" )] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs index ef9b267c..90d8c4b8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs @@ -48,4 +48,4 @@ This program is provided to you under the terms of the Microsoft Public )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] +[assembly: XmlnsDefinition( "https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes" )] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs index ef9b267c..90d8c4b8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs @@ -48,4 +48,4 @@ This program is provided to you under the terms of the Microsoft Public )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] +[assembly: XmlnsDefinition( "https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes" )] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs index 8f95e0d2..8e2d0e99 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs @@ -45,4 +45,4 @@ This program is provided to you under the terms of the New BSD )] -[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes")] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs index a400c9da..bf472499 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs @@ -14,7 +14,6 @@ This program is provided to you under the terms of the Microsoft Public ***********************************************************************************/ -using System.Reflection; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; @@ -24,7 +23,7 @@ This program is provided to you under the terms of the Microsoft Public // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -[assembly: CLSCompliant( true )] +[assembly: CLSCompliant(true)] //In order to begin building localizable applications, set //CultureYouAreCodingWith in your .csproj file @@ -38,18 +37,18 @@ This program is provided to you under the terms of the Microsoft Public [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) + //(used if a resource is not found in the page, + // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) )] -[assembly: XmlnsPrefix( "http://schemas.xceed.com/wpf/xaml/avalondock", "xcad" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Controls" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Converters" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Layout" )] -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )] +[assembly: XmlnsPrefix("https://github.com/Dirkster99/AvalonDock", "xcad")] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock")] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Controls")] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Converters")] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Layout")] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] diff --git a/source/TestApp/MainWindow.xaml b/source/TestApp/MainWindow.xaml index 0318e243..bc03efac 100644 --- a/source/TestApp/MainWindow.xaml +++ b/source/TestApp/MainWindow.xaml @@ -20,7 +20,7 @@ x:Class="TestApp.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:avalonDock="http://schemas.xceed.com/wpf/xaml/avalondock" + xmlns:avalonDock="https://github.com/Dirkster99/AvalonDock" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:TestApp" xmlns:winformsIntegration="clr-namespace:System.Windows.Forms.Integration;assembly=WindowsFormsIntegration" From b8b424e18e3135c03a146f6a8d22e95c3330b92a Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 16:41:40 +0100 Subject: [PATCH 10/13] Replaced 'xcad' namespace short-cut with 'avalondock' --- .../Views/AnchorablePaneTestWindow.xaml | 50 +++++++++---------- ...orableFloatingWindowControlTestWindow.xaml | 46 ++++++++--------- source/CleanAll.bat | 2 +- .../Properties/AssemblyInfo.cs | 2 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml b/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml index 2ba15d22..e5d8e4cd 100644 --- a/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml +++ b/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml @@ -1,38 +1,38 @@ - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + + - - - - - + + + + + + diff --git a/source/AutomationTest/AvalonDockTest/Views/LayoutAnchorableFloatingWindowControlTestWindow.xaml b/source/AutomationTest/AvalonDockTest/Views/LayoutAnchorableFloatingWindowControlTestWindow.xaml index 6a6790be..3c38f291 100644 --- a/source/AutomationTest/AvalonDockTest/Views/LayoutAnchorableFloatingWindowControlTestWindow.xaml +++ b/source/AutomationTest/AvalonDockTest/Views/LayoutAnchorableFloatingWindowControlTestWindow.xaml @@ -1,38 +1,38 @@  - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - + + \ No newline at end of file diff --git a/source/CleanAll.bat b/source/CleanAll.bat index 6a535fbb..6c6a49d0 100644 --- a/source/CleanAll.bat +++ b/source/CleanAll.bat @@ -32,7 +32,7 @@ ECHO XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ECHO. ECHO Removing vs settings folder with *.sou file ECHO. -ECHO RMDIR /S /Q .vs +RMDIR /S /Q .vs ECHO Deleting BIN and OBJ Folders in MLibTest ECHO. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs index bf472499..c56b8653 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs @@ -44,7 +44,7 @@ This program is provided to you under the terms of the Microsoft Public // app, or any theme specific resource dictionaries) )] -[assembly: XmlnsPrefix("https://github.com/Dirkster99/AvalonDock", "xcad")] +[assembly: XmlnsPrefix("https://github.com/Dirkster99/AvalonDock", "avalondock")] [assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock")] [assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Controls")] [assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Converters")] From f9012dc8b751b88ad5267b19bfb04267326725ab Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 17:31:42 +0100 Subject: [PATCH 11/13] Removed ads in file headers and adjusted license information to be consistent towards AvalonDock and MS-PL (some file headers stated New BSD most stated MS-PL ... some referenced AvalonDock some Extended Toolkit ...) --- .../AeroColors.cs | 15 +++------- .../AeroTheme.cs | 15 +++------- .../Brushes.xaml | 15 +++------- .../Controls/SplineBorder.cs | 15 +++------- .../Properties/AssemblyInfo.cs | 30 +++++++------------ .../Theme.xaml | 15 +++------- .../Controls/SplineBorder.cs | 13 ++------ .../DarkBrushes.xaml | 15 +++------- .../ExpressionDarkTheme.cs | 13 ++------ .../ExpressionLightTheme.cs | 13 ++------ .../LightBrushes.xaml | 15 +++------- .../Properties/AssemblyInfo.cs | 30 +++++++------------ .../Theme.xaml | 15 +++------- .../Brushes.xaml | 15 +++------- .../MetroTheme.cs | 15 +++------- .../Properties/AssemblyInfo.cs | 30 +++++++------------ .../Theme.xaml | 15 +++------- .../Brushes.xaml | 15 +++------- .../Properties/AssemblyInfo.cs | 30 +++++++------------ .../Theme.xaml | 15 +++------- .../VS2010Theme.cs | 15 +++------- .../Properties/AssemblyInfo.cs | 13 ++------ .../Themes/Generic.xaml | 26 +++++----------- .../Vs2013BlueTheme.cs | 13 ++------ .../Vs2013DarkTheme.cs | 13 ++------ .../Vs2013LightTheme.cs | 13 ++------ .../Commands/RelayCommand.cs | 15 +++------- .../AnchorablePaneControlOverlayArea.cs | 15 +++------- .../Controls/AnchorablePaneDropTarget.cs | 15 +++------- .../Controls/AnchorablePaneTabPanel.cs | 15 +++------- .../Controls/AnchorablePaneTitle.cs | 15 +++------- .../Controls/AutoHideWindowManager.cs | 15 +++------- .../Controls/BindingHelper.cs | 15 +++------- .../Controls/ContextMenuEx.cs | 15 +++------- .../Controls/DockingManagerDropTarget.cs | 15 +++------- .../Controls/DockingManagerOverlayArea.cs | 15 +++------- .../DocumentPaneControlOverlayArea.cs | 15 +++------- .../DocumentPaneDropAsAnchorableTarget.cs | 15 +++------- .../Controls/DocumentPaneDropTarget.cs | 15 +++------- .../Controls/DocumentPaneGroupDropTarget.cs | 15 +++------- .../Controls/DocumentPaneTabPanel.cs | 15 +++------- .../Controls/DragService.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/Controls/DropArea.cs | 15 +++------- .../Controls/DropDownButton.cs | 15 +++------- .../Controls/DropDownControlArea.cs | 15 +++------- .../Controls/DropTarget.cs | 15 +++------- .../Controls/DropTargetBase.cs | 15 +++------- .../Controls/DropTargetType.cs | 15 +++------- .../Controls/Extentions.cs | 15 +++------- .../Controls/FocusElementManager.cs | 15 +++------- .../Controls/FullWeakDictionary.cs | 15 +++------- .../Controls/IDropTarget.cs | 15 +++------- .../Controls/IOverlayWindow.cs | 15 +++------- .../Controls/IOverlayWindowArea.cs | 15 +++------- .../Controls/IOverlayWindowDropTarget.cs | 15 +++------- .../Controls/IOverlayWindowHost.cs | 15 +++------- .../Controls/LayoutAnchorControl.cs | 15 +++------- .../Controls/LayoutAnchorGroupControl.cs | 15 +++------- .../Controls/LayoutAnchorSideControl.cs | 15 +++------- .../Controls/LayoutAnchorableControl.cs | 15 +++------- .../LayoutAnchorableFloatingWindowControl.cs | 15 +++------- .../Controls/LayoutAnchorableItem.cs | 15 +++------- .../Controls/LayoutAnchorablePaneControl.cs | 15 +++------- .../LayoutAnchorablePaneGroupControl.cs | 15 +++------- .../Controls/LayoutAnchorableTabItem.cs | 15 +++------- .../Controls/LayoutAutoHideWindowControl.cs | 15 +++------- .../Controls/LayoutDocumentControl.cs | 15 +++------- .../LayoutDocumentFloatingWindowControl.cs | 15 +++------- .../Controls/LayoutDocumentItem.cs | 15 +++------- .../Controls/LayoutDocumentPaneControl.cs | 15 +++------- .../LayoutDocumentPaneGroupControl.cs | 15 +++------- .../Controls/LayoutDocumentTabItem.cs | 15 +++------- .../Controls/LayoutFloatingWindowControl.cs | 15 +++------- .../Controls/LayoutGridControl.cs | 15 +++------- .../Controls/LayoutGridResizerControl.cs | 15 +++------- .../Controls/LayoutItem.cs | 15 +++------- .../Controls/LayoutPanelControl.cs | 15 +++------- .../Controls/MenuItemEx.cs | 15 +++------- .../Controls/NavigatorWindow.cs | 15 +++------- .../Controls/OverlayArea.cs | 15 +++------- .../Controls/OverlayWindow.cs | 15 +++------- .../Controls/OverlayWindowDropTarget.cs | 15 +++------- .../Controls/OverlayWindowDropTargetType.cs | 15 +++------- .../Controls/ReentrantFlag.cs | 15 +++------- .../Controls/Shell/Standard/ComGuids.cs | 15 +++------- .../Controls/Shell/Standard/Debug.cs | 15 +++------- .../Controls/Shell/Standard/DoubleUtil.cs | 16 +++------- .../Controls/Shell/Standard/DpiHelper.cs | 15 +++------- .../Controls/Shell/Standard/ErrorCodes.cs | 15 +++------- .../Controls/Shell/Standard/MessageWindow.cs | 15 +++------- .../Controls/Shell/Standard/NativeMethods.cs | 15 +++------- .../Controls/Shell/Standard/ShellProvider.cs | 15 +++------- .../Controls/Shell/Standard/StreamHelper.cs | 15 +++------- .../Controls/Shell/Standard/Utilities.cs | 15 +++------- .../Controls/Shell/Standard/Verify.cs | 15 +++------- .../Controls/Shell/SystemCommands.cs | 16 +++------- .../Controls/Shell/SystemParameters2.cs | 15 +++------- .../Controls/Shell/WindowChrome.cs | 15 +++------- .../Controls/Shell/WindowChromeWorker.cs | 15 +++------- .../Controls/TransformExtentions.cs | 15 +++------- .../Controls/WeakDictionary.cs | 15 +++------- .../Controls/WindowActivateEventArgs.cs | 15 +++------- .../Controls/WindowHookHandler.cs | 15 +++------- ...mmandLayoutItemFromLayoutModelConverter.cs | 15 +++------- .../Converters/AnchorSideToAngleConverter.cs | 15 +++------- .../AnchorSideToOrientationConverter.cs | 15 +++------- ...rableContextMenuHideVisibilityConverter.cs | 15 +++------- ...mmandLayoutItemFromLayoutModelConverter.cs | 15 +++------- .../Converters/BoolToVisibilityConverter.cs | 15 +++------- ...mmandLayoutItemFromLayoutModelConverter.cs | 15 +++------- .../InverseBoolToVisibilityConverter.cs | 15 +++------- .../LayoutItemFromLayoutModelConverter.cs | 15 +++------- .../Converters/NullToDoNothingConverter.cs | 15 +++------- .../UriSourceToBitmapImageConverter.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/DockingManager.cs | 15 +++------- .../DocumentClosedEventArgs.cs | 15 +++------- .../DocumentClosingEventArgs.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/Extentions.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs | 15 +++------- .../Layout/AnchorableShowStrategy.cs | 15 +++------- .../Layout/ChildrenTreeChangedEventArgs.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/Layout/Extentions.cs | 15 +++------- .../Layout/IAdjustableSizeLayout.cs | 15 +++------- .../Layout/ILayoutAnchorablePane.cs | 16 +++------- .../Layout/ILayoutContainer.cs | 15 +++------- .../Layout/ILayoutContentSelector.cs | 15 +++------- .../Layout/ILayoutControl.cs | 15 +++------- .../Layout/ILayoutDocumentPane.cs | 15 +++------- .../Layout/ILayoutElement.cs | 15 +++------- .../Layout/ILayoutElementWithVisibility.cs | 15 +++------- .../Layout/ILayoutGroup.cs | 15 +++------- .../Layout/ILayoutOrientableElement.cs | 15 +++------- .../Layout/ILayoutPane.cs | 15 +++------- .../Layout/ILayoutPaneSerializable.cs | 16 +++------- .../Layout/ILayoutPanelElement.cs | 16 +++------- .../Layout/ILayoutPositionableElement.cs | 15 +++------- .../Layout/ILayoutPreviousContainer.cs | 15 +++------- .../Layout/ILayoutRoot.cs | 15 +++------- .../Layout/ILayoutUpdateStrategy.cs | 15 +++------- .../Layout/LayoutAnchorGroup.cs | 15 +++------- .../Layout/LayoutAnchorSide.cs | 15 +++------- .../Layout/LayoutAnchorable.cs | 15 +++------- .../Layout/LayoutAnchorableFloatingWindow.cs | 15 +++------- .../Layout/LayoutAnchorablePane.cs | 15 +++------- .../Layout/LayoutAnchorablePaneGroup.cs | 15 +++------- .../Layout/LayoutContent.cs | 15 +++------- .../Layout/LayoutDocument.cs | 16 +++------- .../Layout/LayoutDocumentFloatingWindow.cs | 15 +++------- .../Layout/LayoutDocumentPane.cs | 15 +++------- .../Layout/LayoutDocumentPaneGroup.cs | 15 +++------- .../Layout/LayoutElement.cs | 15 +++------- .../Layout/LayoutElementEventArgs.cs | 15 +++------- .../Layout/LayoutFloatingWindow.cs | 15 +++------- .../Layout/LayoutGroup.cs | 15 +++------- .../Layout/LayoutGroupBase.cs | 15 +++------- .../Layout/LayoutPanel.cs | 15 +++------- .../Layout/LayoutPositionableGroup.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs | 18 +++-------- .../LayoutSerializationCallbackEventArgs.cs | 15 +++------- .../Layout/Serialization/LayoutSerializer.cs | 15 +++------- .../Serialization/XmlLayoutSerializer.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/LayoutEventArgs.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/MathHelper.cs | 15 +++------- .../Properties/AssemblyInfo.cs | 15 +++------- .../Themes/DictionaryTheme.cs | 15 +++------- .../Themes/GenericTheme.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/Themes/Theme.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/Themes/generic.xaml | 15 +++------- .../Xceed.Wpf.AvalonDock/Win32Helper.cs | 15 +++------- .../Xceed.Wpf.AvalonDock/WindowHelper.cs | 15 +++------- source/TestApp/App.xaml | 15 +++------- source/TestApp/App.xaml.cs | 21 ++----------- source/TestApp/MainWindow.xaml | 25 +++++----------- source/TestApp/MainWindow.xaml.cs | 13 ++------ source/TestApp/Properties/AssemblyInfo.cs | 13 ++------ source/TestApp/TestUserControl.xaml | 17 ++++------- source/TestApp/TestUserControl.xaml.cs | 13 ++------ source/TestApp/UserControl1.Designer.cs | 13 ++------ source/TestApp/UserControl1.cs | 19 ++---------- 179 files changed, 736 insertions(+), 2029 deletions(-) diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs index 85a138f1..69555f23 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs @@ -1,18 +1,11 @@ -/************************************************************************************* - - Extended WPF Toolkit +/************************************************************************ + AvalonDock 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 - - ***********************************************************************************/ + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ using System.Windows; diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs index 29ba1cae..c5387b85 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs @@ -1,18 +1,11 @@ -/************************************************************************************* - - Extended WPF Toolkit +/************************************************************************ + AvalonDock 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 - - ***********************************************************************************/ + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ using System; diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml index bb1d16d5..6611bbd8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml @@ -1,18 +1,11 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> CultureYouAreCodingWith in your .csproj file @@ -40,12 +30,12 @@ This program is provided to you under the terms of the Microsoft Public [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) + //(used if a resource is not found in the page, + // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) )] -[assembly: XmlnsDefinition( "https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes" )] \ No newline at end of file +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] \ No newline at end of file diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml index 73e98fbe..f47eccd9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml @@ -1,18 +1,11 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs index a678b1fb..9c5e134d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs @@ -1,18 +1,11 @@ /************************************************************************ - AvalonDock Copyright (C) 2007-2013 Xceed Software Inc. - This program is provided to you under the terms of the New BSD - License (BSD) as published at http://avalondock.codeplex.com/license - - For more features, controls, and fast professional support, - pick up AvalonDock in Extended WPF Toolkit Plus at http://xceed.com/wpf_toolkit - - Stay informed: follow @datagrid on Twitter or Like facebook.com/datagrids - - **********************************************************************/ + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ using System; diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs index c54d9213..ada3d595 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs @@ -1,18 +1,11 @@ /************************************************************************ - AvalonDock Copyright (C) 2007-2013 Xceed Software Inc. - This program is provided to you under the terms of the New BSD - License (BSD) as published at http://avalondock.codeplex.com/license - - For more features, controls, and fast professional support, - pick up AvalonDock in Extended WPF Toolkit Plus at http://xceed.com/wpf_toolkit - - Stay informed: follow @datagrid on Twitter or Like facebook.com/datagrids - - **********************************************************************/ + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ using System; diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightBrushes.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightBrushes.xaml index d9cb5543..d198b3c9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightBrushes.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightBrushes.xaml @@ -1,18 +1,11 @@ - + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs index c0ad3efd..3c724777 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs @@ -1,22 +1,12 @@ /************************************************************************ - AvalonDock Copyright (C) 2007-2013 Xceed Software Inc. - This program is provided to you under the terms of the New BSD - License (BSD) as published at http://avalondock.codeplex.com/license - - For more features, controls, and fast professional support, - pick up AvalonDock in Extended WPF Toolkit Plus at http://xceed.com/wpf_toolkit - - Stay informed: follow @datagrid on Twitter or Like facebook.com/datagrids - - **********************************************************************/ + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; @@ -25,8 +15,8 @@ This program is provided to you under the terms of the New BSD // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible( false )] -[assembly: CLSCompliant( true )] +[assembly: ComVisible(false)] +[assembly: CLSCompliant(true)] //In order to begin building localizable applications, set //CultureYouAreCodingWith in your .csproj file @@ -40,12 +30,12 @@ This program is provided to you under the terms of the New BSD [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) + //(used if a resource is not found in the page, + // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) )] -[assembly: XmlnsDefinition( "https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes" )] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml index 25158786..352f6a6a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml @@ -1,18 +1,11 @@ - + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs index 1ff45eec..4751dd5f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs @@ -1,18 +1,11 @@ -/************************************************************************************* - - Extended WPF Toolkit +/************************************************************************ + AvalonDock 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 - - ***********************************************************************************/ + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ using System; diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs index 90d8c4b8..3c724777 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs @@ -1,22 +1,12 @@ -/************************************************************************************* - - Extended WPF Toolkit +/************************************************************************ + AvalonDock 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 - - ***********************************************************************************/ + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; @@ -26,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -[assembly: CLSCompliant( true )] +[assembly: CLSCompliant(true)] //In order to begin building localizable applications, set //CultureYouAreCodingWith in your .csproj file @@ -40,12 +30,12 @@ This program is provided to you under the terms of the Microsoft Public [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) + //(used if a resource is not found in the page, + // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) )] -[assembly: XmlnsDefinition( "https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes" )] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml index 0d7c8330..22ae9782 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml @@ -1,18 +1,11 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs index 90d8c4b8..3c724777 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs @@ -1,22 +1,12 @@ -/************************************************************************************* - - Extended WPF Toolkit +/************************************************************************ + AvalonDock 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 - - ***********************************************************************************/ + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; @@ -26,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -[assembly: CLSCompliant( true )] +[assembly: CLSCompliant(true)] //In order to begin building localizable applications, set //CultureYouAreCodingWith in your .csproj file @@ -40,12 +30,12 @@ This program is provided to you under the terms of the Microsoft Public [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) + //(used if a resource is not found in the page, + // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) )] -[assembly: XmlnsDefinition( "https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes" )] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml index 6563a221..b74f32bf 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml @@ -1,18 +1,11 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + - + This program is provided to you under the terms of the Microsoft Public + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + Date: Wed, 11 Dec 2019 17:48:29 +0100 Subject: [PATCH 12/13] Adjusted file paths to their namespace/project equivalent --- .../AvalonDockTest/AvalonDockTest.csproj | 2 +- source/AvalonDock.sln | 12 +- source/CleanAll.bat | 48 +-- .../AeroColors.cs | 0 .../AeroTheme.cs | 0 .../AvalonDock.Themes.Aero.csproj | 2 +- .../Brushes.xaml | 0 .../Controls/SplineBorder.cs | 0 .../Images/DockAnchorableBottom.png | Bin .../Images/DockAnchorableLeft.png | Bin .../Images/DockAnchorableRight.png | Bin .../Images/DockAnchorableTop.png | Bin .../Images/DockDocumentAsAnchorableBottom.png | Bin .../Images/DockDocumentAsAnchorableLeft.png | Bin .../Images/DockDocumentAsAnchorableRight.png | Bin .../Images/DockDocumentAsAnchorableTop.png | Bin .../Images/DockDocumentBottom.png | Bin .../Images/DockDocumentInside.png | Bin .../Images/DockDocumentLeft.png | Bin .../Images/DockDocumentRight.png | Bin .../Images/DockDocumentTop.png | Bin .../Images/DockPaneEmpty.png | Bin .../Images/DockPaneLargeEmpty.png | Bin .../Images/HTabGroup.png | Bin .../Images/Locked.png | Bin .../Images/PinAutoHide.png | Bin .../Images/PinAutoHide_Black.png | Bin .../Images/PinAutoHide_Dark.png | Bin .../Images/PinClose.png | Bin .../Images/PinClose_Black.png | Bin .../Images/PinClose_Dark.png | Bin .../Images/PinDocMenu.png | Bin .../Images/PinDocMenu_Black.png | Bin .../Images/PinDocMenu_Dark.png | Bin .../Images/PinMaximize.png | Bin .../Images/PinMaximize_Black.png | Bin .../Images/PinMaximize_Dark.png | Bin .../Images/PinMenu.png | Bin .../Images/PinMenu_Black.png | Bin .../Images/PinMenu_Dark.png | Bin .../Images/PinRestore.png | Bin .../Images/PinRestore_Black.png | Bin .../Images/PinRestore_Dark.png | Bin .../Images/VTabGroup.png | Bin .../LICENSE.txt | 0 .../Properties/AssemblyInfo.cs | 0 .../Theme.xaml | 0 .../sn.snk | Bin .../AvalonDock.Themes.Expression.csproj | 2 +- .../Controls/SplineBorder.cs | 0 .../DarkBrushes.xaml | 0 .../DarkTheme.xaml | 0 .../ExpressionDarkTheme.cs | 0 .../ExpressionLightTheme.cs | 0 .../Images/DockAnchorableBottom.png | Bin .../Images/DockAnchorableLeft.png | Bin .../Images/DockAnchorableRight.png | Bin .../Images/DockAnchorableTop.png | Bin .../Images/DockDocumentAsAnchorableBottom.png | Bin .../Images/DockDocumentAsAnchorableLeft.png | Bin .../Images/DockDocumentAsAnchorableRight.png | Bin .../Images/DockDocumentAsAnchorableTop.png | Bin .../Images/DockDocumentBottom.png | Bin .../Images/DockDocumentInside.png | Bin .../Images/DockDocumentLeft.png | Bin .../Images/DockDocumentRight.png | Bin .../Images/DockDocumentTop.png | Bin .../Images/DockPaneEmpty.png | Bin .../Images/DockPaneLargeEmpty.png | Bin .../Images/HTabGroup.png | Bin .../Images/Locked.png | Bin .../Images/PinAutoHide.png | Bin .../Images/PinAutoHide_Black.png | Bin .../Images/PinAutoHide_Dark.png | Bin .../Images/PinAutoHide_Light.png | Bin .../Images/PinClose.png | Bin .../Images/PinClose_Black.png | Bin .../Images/PinClose_Dark.png | Bin .../Images/PinClose_Light.png | Bin .../Images/PinDocMenu_Black.png | Bin .../Images/PinDocMenu_Dark.png | Bin .../Images/PinMaximize.png | Bin .../Images/PinMaximize_Black.png | Bin .../Images/PinMaximize_Dark.png | Bin .../Images/PinMaximize_Light.png | Bin .../Images/PinMenu.png | Bin .../Images/PinMenu_Black.png | Bin .../Images/PinMenu_Dark.png | Bin .../Images/PinMenu_Light.png | Bin .../Images/PinRestore.png | Bin .../Images/PinRestore_Black.png | Bin .../Images/PinRestore_Dark.png | Bin .../Images/PinRestore_Light.png | Bin .../Images/VTabGroup.png | Bin .../LICENSE.txt | 0 .../LightBrushes.xaml | 0 .../LightTheme.xaml | 0 .../Properties/AssemblyInfo.cs | 0 .../Theme.xaml | 4 +- .../sn.snk | Bin .../AvalonDock.Themes.Metro.csproj | 2 +- .../Brushes.xaml | 0 .../Images/DockAnchorableBottom.png | Bin .../Images/DockAnchorableLeft.png | Bin .../Images/DockAnchorableRight.png | Bin .../Images/DockAnchorableTop.png | Bin .../Images/DockDocumentAsAnchorableBottom.png | Bin .../Images/DockDocumentAsAnchorableLeft.png | Bin .../Images/DockDocumentAsAnchorableRight.png | Bin .../Images/DockDocumentAsAnchorableTop.png | Bin .../Images/DockDocumentBottom.png | Bin .../Images/DockDocumentInside.png | Bin .../Images/DockDocumentLeft.png | Bin .../Images/DockDocumentRight.png | Bin .../Images/DockDocumentTop.png | Bin .../Images/DockPaneEmpty.png | Bin .../Images/DockPaneLargeEmpty.png | Bin .../Images/HTabGroup.png | Bin .../Images/Locked.png | Bin .../Images/PinAutoHide.png | Bin .../Images/PinAutoHide_Black.png | Bin .../Images/PinAutoHide_Dark.png | Bin .../Images/PinClose.png | Bin .../Images/PinClose_Black.png | Bin .../Images/PinClose_Dark.png | Bin .../Images/PinDocMenu.png | Bin .../Images/PinDocMenu_Black.png | Bin .../Images/PinMaximize.png | Bin .../Images/PinMaximize_Black.png | Bin .../Images/PinMaximize_Dark.png | Bin .../Images/PinMenu.png | Bin .../Images/PinMenu_Black.png | Bin .../Images/PinMenu_Dark.png | Bin .../Images/PinRestore.png | Bin .../Images/PinRestore_Black.png | Bin .../Images/PinRestore_Dark.png | Bin .../Images/VTabGroup.png | Bin .../LICENSE.txt | 0 .../MetroTheme.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Theme.xaml | 0 .../sn.snk | Bin .../AvalonDock.Themes.VS2010.csproj | 2 +- .../Brushes.xaml | 0 .../Images/DockAnchorableBottom.png | Bin .../Images/DockAnchorableLeft.png | Bin .../Images/DockAnchorableRight.png | Bin .../Images/DockAnchorableTop.png | Bin .../Images/DockDocumentAsAnchorableBottom.png | Bin .../Images/DockDocumentAsAnchorableLeft.png | Bin .../Images/DockDocumentAsAnchorableRight.png | Bin .../Images/DockDocumentAsAnchorableTop.png | Bin .../Images/DockDocumentBottom.png | Bin .../Images/DockDocumentInside.png | Bin .../Images/DockDocumentLeft.png | Bin .../Images/DockDocumentRight.png | Bin .../Images/DockDocumentTop.png | Bin .../Images/DockPaneEmpty.png | Bin .../Images/DockPaneLargeEmpty.png | Bin .../Images/HTabGroup.png | Bin .../Images/Locked.png | Bin .../Images/PinAutoHide.png | Bin .../Images/PinAutoHide_Black.png | Bin .../Images/PinAutoHide_Dark.png | Bin .../Images/PinClose.png | Bin .../Images/PinClose_Black.png | Bin .../Images/PinClose_Dark.png | Bin .../Images/PinDocMenu.png | Bin .../Images/PinDocMenu_Black.png | Bin .../Images/PinMaximize.png | Bin .../Images/PinMaximize_Black.png | Bin .../Images/PinMaximize_Dark.png | Bin .../Images/PinMenu.png | Bin .../Images/PinMenu_Black.png | Bin .../Images/PinMenu_Dark.png | Bin .../Images/PinRestore.png | Bin .../Images/PinRestore_Black.png | Bin .../Images/PinRestore_Dark.png | Bin .../Images/VTabGroup.png | Bin .../LICENSE.txt | 0 .../Properties/AssemblyInfo.cs | 0 .../Theme.xaml | 0 .../VS2010Theme.cs | 0 .../sn.snk | Bin .../AvalonDock.Themes.VS2013.csproj | 2 +- .../BlueBrushs.xaml | 0 .../BlueTheme.xaml | 0 .../DarkBrushs.xaml | 0 .../DarkTheme.xaml | 0 .../Images/DockAnchorableBottom.png | Bin .../Images/DockAnchorableLeft.png | Bin .../Images/DockAnchorableRight.png | Bin .../Images/DockAnchorableTop.png | Bin .../Images/DockDocumentAsAnchorableBottom.png | Bin .../Images/DockDocumentAsAnchorableLeft.png | Bin .../Images/DockDocumentAsAnchorableRight.png | Bin .../Images/DockDocumentAsAnchorableTop.png | Bin .../Images/DockDocumentBottom.png | Bin .../Images/DockDocumentInside.png | Bin .../Images/DockDocumentLeft.png | Bin .../Images/DockDocumentRight.png | Bin .../Images/DockDocumentTop.png | Bin .../Images/DockPaneEmpty.png | Bin .../Images/DockPaneLargeEmpty.png | Bin .../Images/HTabGroup.png | Bin .../Images/Locked.png | Bin .../Images/PinAutoHide.png | Bin .../Images/PinAutoHide_Black.png | Bin .../Images/PinAutoHide_Dark.png | Bin .../Images/PinAutoHide_White.png | Bin .../Images/PinClose.png | Bin .../Images/PinClose_Black.png | Bin .../Images/PinClose_Dark.png | Bin .../Images/PinClose_White.png | Bin .../Images/PinDocMenu.png | Bin .../Images/PinDocMenu_Black.png | Bin .../Images/PinMaximize.png | Bin .../Images/PinMaximize_Black.png | Bin .../Images/PinMaximize_Dark.png | Bin .../Images/PinMenu.png | Bin .../Images/PinMenu_Black.png | Bin .../Images/PinMenu_Dark.png | Bin .../Images/PinMenu_White.png | Bin .../Images/PinRestore.png | Bin .../Images/PinRestore_Black.png | Bin .../Images/PinRestore_Dark.png | Bin .../Images/VTabGroup.png | Bin .../LICENSE.txt | 0 .../LightBrushs.xaml | 0 .../LightTheme.xaml | 0 .../OverlayButtons.xaml | 0 .../Properties/AssemblyInfo.cs | 0 .../Themes/Generic.xaml | 0 .../Themes/Menu/DarkBrushs.xaml | 0 .../Themes/Menu/LightBrushs.xaml | 0 .../Themes/Menu/MenuItem.xaml | 0 .../Themes/Menu/MenuKeys.cs | 0 .../Themes/ResourceKeys.cs | 0 .../Vs2013BlueTheme.cs | 0 .../Vs2013DarkTheme.cs | 0 .../Vs2013LightTheme.cs | 0 .../sn.snk | Bin .../AvalonDock.csproj | 0 .../Commands/RelayCommand.cs | 0 .../AnchorablePaneControlOverlayArea.cs | 0 .../Controls/AnchorablePaneDropTarget.cs | 0 .../Controls/AnchorablePaneTabPanel.cs | 0 .../Controls/AnchorablePaneTitle.cs | 0 .../Controls/AutoHideWindowManager.cs | 0 .../Controls/BindingHelper.cs | 0 .../Controls/ContextMenuEx.cs | 0 .../Controls/DockingManagerDropTarget.cs | 0 .../Controls/DockingManagerOverlayArea.cs | 0 .../DocumentPaneControlOverlayArea.cs | 0 .../DocumentPaneDropAsAnchorableTarget.cs | 0 .../Controls/DocumentPaneDropTarget.cs | 0 .../Controls/DocumentPaneGroupDropTarget.cs | 0 .../Controls/DocumentPaneTabPanel.cs | 0 .../Controls/DragService.cs | 0 .../Controls/DropArea.cs | 0 .../Controls/DropDownButton.cs | 0 .../Controls/DropDownControlArea.cs | 0 .../Controls/DropTarget.cs | 0 .../Controls/DropTargetBase.cs | 0 .../Controls/DropTargetType.cs | 0 .../Controls/Extentions.cs | 0 .../Controls/FocusElementManager.cs | 0 .../Controls/FullWeakDictionary.cs | 0 .../Controls/IDropTarget.cs | 0 .../Controls/IOverlayWindow.cs | 0 .../Controls/IOverlayWindowArea.cs | 0 .../Controls/IOverlayWindowDropTarget.cs | 0 .../Controls/IOverlayWindowHost.cs | 0 .../Controls/LayoutAnchorControl.cs | 0 .../Controls/LayoutAnchorGroupControl.cs | 0 .../Controls/LayoutAnchorSideControl.cs | 0 .../Controls/LayoutAnchorableControl.cs | 0 .../LayoutAnchorableFloatingWindowControl.cs | 0 .../Controls/LayoutAnchorableItem.cs | 0 .../Controls/LayoutAnchorablePaneControl.cs | 210 +++++----- .../LayoutAnchorablePaneGroupControl.cs | 0 .../Controls/LayoutAnchorableTabItem.cs | 0 .../Controls/LayoutAutoHideWindowControl.cs | 0 .../Controls/LayoutDocumentControl.cs | 0 .../LayoutDocumentFloatingWindowControl.cs | 0 .../Controls/LayoutDocumentItem.cs | 0 .../Controls/LayoutDocumentPaneControl.cs | 224 +++++------ .../LayoutDocumentPaneGroupControl.cs | 0 .../Controls/LayoutDocumentTabItem.cs | 0 .../Controls/LayoutFloatingWindowControl.cs | 0 .../Controls/LayoutGridControl.cs | 0 .../Controls/LayoutGridResizerControl.cs | 0 .../Controls/LayoutItem.cs | 0 .../Controls/LayoutPanelControl.cs | 0 .../Controls/MenuItemEx.cs | 0 .../Controls/NavigatorWindow.cs | 0 .../Controls/OverlayArea.cs | 0 .../Controls/OverlayWindow.cs | 0 .../Controls/OverlayWindowDropTarget.cs | 0 .../Controls/OverlayWindowDropTargetType.cs | 0 .../Controls/ReentrantFlag.cs | 0 .../Controls/Shell/Standard/ComGuids.cs | 0 .../Controls/Shell/Standard/Debug.cs | 0 .../Controls/Shell/Standard/DoubleUtil.cs | 0 .../Controls/Shell/Standard/DpiHelper.cs | 0 .../Controls/Shell/Standard/ErrorCodes.cs | 0 .../Controls/Shell/Standard/MessageWindow.cs | 0 .../Controls/Shell/Standard/NativeMethods.cs | 0 .../Controls/Shell/Standard/ShellProvider.cs | 0 .../Controls/Shell/Standard/StreamHelper.cs | 0 .../Controls/Shell/Standard/Utilities.cs | 0 .../Controls/Shell/Standard/Verify.cs | 0 .../Controls/Shell/SystemCommands.cs | 0 .../Controls/Shell/SystemParameters2.cs | 0 .../Controls/Shell/WindowChrome.cs | 0 .../Controls/Shell/WindowChromeWorker.cs | 0 .../Controls/TransformExtentions.cs | 0 .../Controls/WeakDictionary.cs | 0 .../Controls/WindowActivateEventArgs.cs | 0 .../Controls/WindowHookHandler.cs | 0 ...mmandLayoutItemFromLayoutModelConverter.cs | 0 .../Converters/AnchorSideToAngleConverter.cs | 0 .../AnchorSideToOrientationConverter.cs | 0 ...rableContextMenuHideVisibilityConverter.cs | 0 ...mmandLayoutItemFromLayoutModelConverter.cs | 0 .../Converters/BoolToVisibilityConverter.cs | 0 ...mmandLayoutItemFromLayoutModelConverter.cs | 0 .../InverseBoolToVisibilityConverter.cs | 0 .../LayoutItemFromLayoutModelConverter.cs | 0 .../Converters/NullToDoNothingConverter.cs | 0 .../UriSourceToBitmapImageConverter.cs | 0 .../DockingManager.cs | 0 .../DocumentClosedEventArgs.cs | 0 .../DocumentClosingEventArgs.cs | 0 .../Extentions.cs | 0 .../LICENSE.txt | 0 .../Layout/AnchorSide.cs | 0 .../Layout/AnchorableShowStrategy.cs | 0 .../Layout/ChildrenTreeChangedEventArgs.cs | 0 .../Layout/Extentions.cs | 0 .../Layout/IAdjustableSizeLayout.cs | 0 .../Layout/ILayoutAnchorablePane.cs | 0 .../Layout/ILayoutContainer.cs | 0 .../Layout/ILayoutContentSelector.cs | 0 .../Layout/ILayoutControl.cs | 0 .../Layout/ILayoutDocumentPane.cs | 0 .../Layout/ILayoutElement.cs | 0 ...LayoutElementForFloatingWindowExtension.cs | 0 .../Layout/ILayoutElementWithVisibility.cs | 0 .../Layout/ILayoutGroup.cs | 0 .../Layout/ILayoutOrientableElement.cs | 0 .../Layout/ILayoutPane.cs | 0 .../Layout/ILayoutPaneSerializable.cs | 0 .../Layout/ILayoutPanelElement.cs | 0 .../Layout/ILayoutPositionableElement.cs | 0 .../Layout/ILayoutPreviousContainer.cs | 0 .../Layout/ILayoutRoot.cs | 0 .../Layout/ILayoutUpdateStrategy.cs | 0 .../Layout/LayoutAnchorGroup.cs | 0 .../Layout/LayoutAnchorSide.cs | 0 .../Layout/LayoutAnchorable.cs | 0 .../Layout/LayoutAnchorableFloatingWindow.cs | 0 .../Layout/LayoutAnchorablePane.cs | 0 .../Layout/LayoutAnchorablePaneGroup.cs | 0 .../Layout/LayoutContent.cs | 0 .../Layout/LayoutDocument.cs | 0 .../Layout/LayoutDocumentFloatingWindow.cs | 0 .../Layout/LayoutDocumentPane.cs | 0 .../Layout/LayoutDocumentPaneGroup.cs | 0 .../Layout/LayoutElement.cs | 0 .../Layout/LayoutElementEventArgs.cs | 0 .../Layout/LayoutFloatingWindow.cs | 0 .../Layout/LayoutGroup.cs | 0 .../Layout/LayoutGroupBase.cs | 0 .../Layout/LayoutPanel.cs | 0 .../Layout/LayoutPositionableGroup.cs | 0 .../Layout/LayoutRoot.cs | 0 .../LayoutSerializationCallbackEventArgs.cs | 0 .../Layout/Serialization/LayoutSerializer.cs | 0 .../Serialization/XmlLayoutSerializer.cs | 0 .../LayoutEventArgs.cs | 0 .../MathHelper.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../Properties/Resources.ca-ES.resx | 0 .../Properties/Resources.cs-CZ.resx | 0 .../Properties/Resources.de.resx | 0 .../Properties/Resources.es.resx | 0 .../Properties/Resources.fr.resx | 0 .../Properties/Resources.hu.resx | 0 .../Properties/Resources.it.resx | 0 .../Properties/Resources.ja.resx | 0 .../Properties/Resources.ko.resx | 0 .../Properties/Resources.nl-BE.resx | 0 .../Properties/Resources.pl.resx | 0 .../Properties/Resources.pt-BR.resx | 0 .../Properties/Resources.resx | 0 .../Properties/Resources.ro.resx | 0 .../Properties/Resources.ru.resx | 0 .../Properties/Resources.sv.resx | 0 .../Properties/Resources.zh-Hans.resx | 0 .../Properties/Resources.zh-Hant.resx | 0 .../Themes/DictionaryTheme.cs | 0 .../Themes/Generic/Images/DockBottom.PNG | Bin .../Themes/Generic/Images/DockLeft.PNG | Bin .../Themes/Generic/Images/DockPane.PNG | Bin .../Themes/Generic/Images/DockPaneEmpty.png | Bin .../Themes/Generic/Images/DockRight.PNG | Bin .../Themes/Generic/Images/DockTop.PNG | Bin .../Themes/Generic/Images/HTabGroup.png | Bin .../Generic/Images/InnerDockDocPaneBottom.png | Bin .../Generic/Images/InnerDockDocPaneLeft.png | Bin .../Generic/Images/InnerDockDocPaneRight.png | Bin .../Generic/Images/InnerDockDocPaneTop.png | Bin .../Generic/Images/InnerDockPaneBottom.png | Bin .../Generic/Images/InnerDockPaneInside.png | Bin .../Generic/Images/InnerDockPaneLeft.png | Bin .../Generic/Images/InnerDockPaneRight.png | Bin .../Generic/Images/InnerDockPaneTop.png | Bin .../Themes/Generic/Images/Locked.png | Bin .../Themes/Generic/Images/PinAutoHide.png | Bin .../Themes/Generic/Images/PinClose.png | Bin .../Themes/Generic/Images/PinDocMenu.png | Bin .../Themes/Generic/Images/PinMaximize.png | Bin .../Themes/Generic/Images/PinMenu.png | Bin .../Themes/Generic/Images/PinRestore.png | Bin .../Themes/Generic/Images/VTabGroup.png | Bin .../Themes/GenericTheme.cs | 12 +- .../Themes/Theme.cs | 0 .../Themes/generic.xaml | 0 .../Win32Helper.cs | 0 .../WindowHelper.cs | 0 .../sn.snk | Bin .../ViewModels/Tools/ColorPickerViewModel.cs | 368 +++++++++--------- .../Demos/ViewModels/Tools/Tool1_ViewModel.cs | 364 ++++++++--------- .../Demos/ViewModels/Tools/Tool2_ViewModel.cs | 364 ++++++++--------- .../Demos/ViewModels/Tools/Tool3_ViewModel.cs | 364 ++++++++--------- source/MLibTest/MLibTest/MLibTest.csproj | 8 +- source/MVVMTestApp/App.xaml | 2 +- source/MVVMTestApp/MVVMTestApp.csproj | 2 +- source/TestApp/App.xaml | 2 +- source/TestApp/TestApp.csproj | 2 +- source/WinFormsTestApp/WinFormsTestApp.csproj | 12 +- 443 files changed, 1005 insertions(+), 1005 deletions(-) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/AeroColors.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/AeroTheme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/AvalonDock.Themes.Aero.csproj (94%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Brushes.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Controls/SplineBorder.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentAsAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentAsAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentAsAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentAsAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentInside.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockDocumentTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockPaneEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/DockPaneLargeEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/HTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/Locked.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinAutoHide.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinAutoHide_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinAutoHide_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinClose.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinClose_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinClose_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinDocMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinDocMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinDocMenu_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinMaximize.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinMaximize_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinMaximize_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinMenu_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinRestore.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinRestore_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/PinRestore_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Images/VTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/LICENSE.txt (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Properties/AssemblyInfo.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/Theme.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Aero => AvalonDock.Themes.Aero}/sn.snk (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/AvalonDock.Themes.Expression.csproj (94%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Controls/SplineBorder.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/DarkBrushes.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/DarkTheme.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/ExpressionDarkTheme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/ExpressionLightTheme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentAsAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentAsAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentAsAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentAsAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentInside.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockDocumentTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockPaneEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/DockPaneLargeEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/HTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/Locked.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinAutoHide.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinAutoHide_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinAutoHide_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinAutoHide_Light.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinClose.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinClose_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinClose_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinClose_Light.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinDocMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinDocMenu_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinMaximize.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinMaximize_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinMaximize_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinMaximize_Light.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinMenu_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinMenu_Light.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinRestore.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinRestore_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinRestore_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/PinRestore_Light.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Images/VTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/LICENSE.txt (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/LightBrushes.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/LightTheme.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Properties/AssemblyInfo.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/Theme.xaml (99%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Expression => AvalonDock.Themes.Expression}/sn.snk (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/AvalonDock.Themes.Metro.csproj (94%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Brushes.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentAsAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentAsAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentAsAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentAsAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentInside.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockDocumentTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockPaneEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/DockPaneLargeEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/HTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/Locked.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinAutoHide.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinAutoHide_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinAutoHide_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinClose.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinClose_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinClose_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinDocMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinDocMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinMaximize.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinMaximize_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinMaximize_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinMenu_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinRestore.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinRestore_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/PinRestore_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Images/VTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/LICENSE.txt (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/MetroTheme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Properties/AssemblyInfo.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/Theme.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.Metro => AvalonDock.Themes.Metro}/sn.snk (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/AvalonDock.Themes.VS2010.csproj (94%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Brushes.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentAsAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentAsAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentAsAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentAsAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentInside.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockDocumentTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockPaneEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/DockPaneLargeEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/HTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/Locked.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinAutoHide.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinAutoHide_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinAutoHide_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinClose.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinClose_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinClose_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinDocMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinDocMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinMaximize.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinMaximize_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinMaximize_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinMenu_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinRestore.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinRestore_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/PinRestore_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Images/VTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/LICENSE.txt (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Properties/AssemblyInfo.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/Theme.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/VS2010Theme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2010 => AvalonDock.Themes.VS2010}/sn.snk (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/AvalonDock.Themes.VS2013.csproj (94%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/BlueBrushs.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/BlueTheme.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/DarkBrushs.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/DarkTheme.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentAsAnchorableBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentAsAnchorableLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentAsAnchorableRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentAsAnchorableTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentInside.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockDocumentTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockPaneEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/DockPaneLargeEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/HTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/Locked.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinAutoHide.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinAutoHide_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinAutoHide_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinAutoHide_White.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinClose.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinClose_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinClose_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinClose_White.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinDocMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinDocMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinMaximize.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinMaximize_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinMaximize_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinMenu_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinMenu_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinMenu_White.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinRestore.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinRestore_Black.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/PinRestore_Dark.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Images/VTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/LICENSE.txt (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/LightBrushs.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/LightTheme.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/OverlayButtons.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Properties/AssemblyInfo.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Themes/Generic.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Themes/Menu/DarkBrushs.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Themes/Menu/LightBrushs.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Themes/Menu/MenuItem.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Themes/Menu/MenuKeys.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Themes/ResourceKeys.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Vs2013BlueTheme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Vs2013DarkTheme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/Vs2013LightTheme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock.Themes.VS2013 => AvalonDock.Themes.VS2013}/sn.snk (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/AvalonDock.csproj (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Commands/RelayCommand.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/AnchorablePaneControlOverlayArea.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/AnchorablePaneDropTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/AnchorablePaneTabPanel.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/AnchorablePaneTitle.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/AutoHideWindowManager.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/BindingHelper.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/ContextMenuEx.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DockingManagerDropTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DockingManagerOverlayArea.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DocumentPaneControlOverlayArea.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DocumentPaneDropAsAnchorableTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DocumentPaneDropTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DocumentPaneGroupDropTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DocumentPaneTabPanel.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DragService.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DropArea.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DropDownButton.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DropDownControlArea.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DropTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DropTargetBase.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/DropTargetType.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Extentions.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/FocusElementManager.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/FullWeakDictionary.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/IDropTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/IOverlayWindow.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/IOverlayWindowArea.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/IOverlayWindowDropTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/IOverlayWindowHost.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorGroupControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorSideControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorableControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorableFloatingWindowControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorableItem.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorablePaneControl.cs (96%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorablePaneGroupControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAnchorableTabItem.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutAutoHideWindowControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutDocumentControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutDocumentFloatingWindowControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutDocumentItem.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutDocumentPaneControl.cs (96%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutDocumentPaneGroupControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutDocumentTabItem.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutFloatingWindowControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutGridControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutGridResizerControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutItem.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/LayoutPanelControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/MenuItemEx.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/NavigatorWindow.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/OverlayArea.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/OverlayWindow.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/OverlayWindowDropTarget.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/OverlayWindowDropTargetType.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/ReentrantFlag.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/ComGuids.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/Debug.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/DoubleUtil.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/DpiHelper.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/ErrorCodes.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/MessageWindow.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/NativeMethods.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/ShellProvider.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/StreamHelper.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/Utilities.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/Standard/Verify.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/SystemCommands.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/SystemParameters2.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/WindowChrome.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/Shell/WindowChromeWorker.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/TransformExtentions.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/WeakDictionary.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/WindowActivateEventArgs.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Controls/WindowHookHandler.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/AnchorSideToAngleConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/AnchorSideToOrientationConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/AnchorableContextMenuHideVisibilityConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/BoolToVisibilityConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/InverseBoolToVisibilityConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/LayoutItemFromLayoutModelConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/NullToDoNothingConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Converters/UriSourceToBitmapImageConverter.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/DockingManager.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/DocumentClosedEventArgs.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/DocumentClosingEventArgs.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Extentions.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/LICENSE.txt (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/AnchorSide.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/AnchorableShowStrategy.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ChildrenTreeChangedEventArgs.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/Extentions.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/IAdjustableSizeLayout.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutAnchorablePane.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutContainer.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutContentSelector.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutControl.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutDocumentPane.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutElement.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutElementForFloatingWindowExtension.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutElementWithVisibility.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutGroup.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutOrientableElement.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutPane.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutPaneSerializable.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutPanelElement.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutPositionableElement.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutPreviousContainer.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutRoot.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/ILayoutUpdateStrategy.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutAnchorGroup.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutAnchorSide.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutAnchorable.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutAnchorableFloatingWindow.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutAnchorablePane.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutAnchorablePaneGroup.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutContent.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutDocument.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutDocumentFloatingWindow.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutDocumentPane.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutDocumentPaneGroup.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutElement.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutElementEventArgs.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutFloatingWindow.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutGroup.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutGroupBase.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutPanel.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutPositionableGroup.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/LayoutRoot.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/Serialization/LayoutSerializer.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Layout/Serialization/XmlLayoutSerializer.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/LayoutEventArgs.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/MathHelper.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/AssemblyInfo.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.Designer.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.ca-ES.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.cs-CZ.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.de.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.es.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.fr.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.hu.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.it.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.ja.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.ko.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.nl-BE.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.pl.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.pt-BR.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.ro.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.ru.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.sv.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.zh-Hans.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Properties/Resources.zh-Hant.resx (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/DictionaryTheme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/DockBottom.PNG (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/DockLeft.PNG (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/DockPane.PNG (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/DockPaneEmpty.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/DockRight.PNG (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/DockTop.PNG (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/HTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockDocPaneBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockDocPaneLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockDocPaneRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockDocPaneTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockPaneBottom.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockPaneInside.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockPaneLeft.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockPaneRight.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/InnerDockPaneTop.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/Locked.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/PinAutoHide.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/PinClose.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/PinDocMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/PinMaximize.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/PinMenu.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/PinRestore.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Generic/Images/VTabGroup.png (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/GenericTheme.cs (68%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/Theme.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Themes/generic.xaml (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/Win32Helper.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/WindowHelper.cs (100%) rename source/Components/{Xceed.Wpf.AvalonDock => AvalonDock}/sn.snk (100%) diff --git a/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj b/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj index 7418220e..806ab08b 100644 --- a/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj +++ b/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj @@ -95,7 +95,7 @@ - + {db81988f-e0f2-45a0-a1fd-8c37f3d35244} AvalonDock diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln index 65828d01..b1f1d0cf 100644 --- a/source/AvalonDock.sln +++ b/source/AvalonDock.sln @@ -8,21 +8,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Projects", "Test Proje EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AvalonDock", "AvalonDock", "{B0EB64E3-2C25-46CC-BBB6-E38EF2584177}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock", "Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock", "Components\AvalonDock\AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Expression", "Components\AvalonDock.Themes.Expression\AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Metro", "Components\AvalonDock.Themes.Metro\AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2013", "Components\Xceed.Wpf.AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2013", "Components\AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MLibTest_Components", "MLibTest_Components", "{72045D3A-A982-4C69-8FB8-6B601363D7ED}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Settings", "MLibTest\MLibTest_Components\Settings\Settings\Settings.csproj", "{2807B493-CC2E-402E-901A-EB138698FEDC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2010", "Components\Xceed.Wpf.AvalonDock.Themes.VS2010\AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2010", "Components\AvalonDock.Themes.VS2010\AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Aero", "Components\Xceed.Wpf.AvalonDock.Themes.Aero\AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Aero", "Components\AvalonDock.Themes.Aero\AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutomationTest", "AutomationTest", "{20876020-CC7D-46BD-9B80-E4F01FC0FD31}" EndProject diff --git a/source/CleanAll.bat b/source/CleanAll.bat index 6c6a49d0..7231ea4c 100644 --- a/source/CleanAll.bat +++ b/source/CleanAll.bat @@ -13,12 +13,12 @@ ECHO MVVMTestApp ECHO TestApp ECHO WinFormsTestApp ECHO. -ECHO Components\Xceed.Wpf.AvalonDock -ECHO Components\Xceed.Wpf.AvalonDock.Themes.Aero -ECHO Components\Xceed.Wpf.AvalonDock.Themes.Expression -ECHO Components\Xceed.Wpf.AvalonDock.Themes.VS2013 -ECHO Components\Xceed.Wpf.AvalonDock.Themes.VS2010 -ECHO Components\Xceed.Wpf.AvalonDock.Themes.Metro +ECHO Components\AvalonDock +ECHO Components\AvalonDock.Themes.Aero +ECHO Components\AvalonDock.Themes.Expression +ECHO Components\AvalonDock.Themes.VS2013 +ECHO Components\AvalonDock.Themes.VS2010 +ECHO Components\AvalonDock.Themes.Metro ECHO. ECHO. REM Ask the user if hes really sure to continue beyond this point XXXXXXXX @@ -65,36 +65,36 @@ ECHO. RMDIR /S /Q WinFormsTestApp\bin RMDIR /S /Q WinFormsTestApp\obj -ECHO Deleting BIN and OBJ Folders in Xceed.Wpf.AvalonDock.Themes.Aero +ECHO Deleting BIN and OBJ Folders in AvalonDock.Themes.Aero ECHO. -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.Aero\bin -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.Aero\obj +RMDIR /S /Q Components\AvalonDock.Themes.Aero\bin +RMDIR /S /Q Components\AvalonDock.Themes.Aero\obj -ECHO Deleting BIN and OBJ Folders in Xceed.Wpf.AvalonDock +ECHO Deleting BIN and OBJ Folders in AvalonDock ECHO. -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock\bin -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock\obj +RMDIR /S /Q Components\AvalonDock\bin +RMDIR /S /Q Components\AvalonDock\obj -ECHO Deleting BIN and OBJ Folders in Xceed.Wpf.AvalonDock.Themes.Expression +ECHO Deleting BIN and OBJ Folders in AvalonDock.Themes.Expression ECHO. -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.Expression\bin -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.Expression\obj +RMDIR /S /Q Components\AvalonDock.Themes.Expression\bin +RMDIR /S /Q Components\AvalonDock.Themes.Expression\obj -ECHO Deleting BIN and OBJ Folders in Xceed.Wpf.AvalonDock.Themes.VS2010 +ECHO Deleting BIN and OBJ Folders in AvalonDock.Themes.VS2010 ECHO. -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.VS2010\bin -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.VS2010\obj +RMDIR /S /Q Components\AvalonDock.Themes.VS2010\bin +RMDIR /S /Q Components\AvalonDock.Themes.VS2010\obj -ECHO Deleting BIN and OBJ Folders in Xceed.Wpf.AvalonDock.Themes.VS2013 +ECHO Deleting BIN and OBJ Folders in AvalonDock.Themes.VS2013 ECHO. -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.VS2013\bin -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.VS2013\obj +RMDIR /S /Q Components\AvalonDock.Themes.VS2013\bin +RMDIR /S /Q Components\AvalonDock.Themes.VS2013\obj -ECHO Deleting BIN and OBJ Folders in Xceed.Wpf.AvalonDock.Themes.Metro +ECHO Deleting BIN and OBJ Folders in AvalonDock.Themes.Metro ECHO. -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.Metro\bin -RMDIR /S /Q Components\Xceed.Wpf.AvalonDock.Themes.Metro\obj +RMDIR /S /Q Components\AvalonDock.Themes.Metro\bin +RMDIR /S /Q Components\AvalonDock.Themes.Metro\obj diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs b/source/Components/AvalonDock.Themes.Aero/AeroColors.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs rename to source/Components/AvalonDock.Themes.Aero/AeroColors.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs b/source/Components/AvalonDock.Themes.Aero/AeroTheme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs rename to source/Components/AvalonDock.Themes.Aero/AeroTheme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj b/source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj rename to source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj index 82254ae5..4f3f31ee 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj +++ b/source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj @@ -30,6 +30,6 @@ - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml b/source/Components/AvalonDock.Themes.Aero/Brushes.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml rename to source/Components/AvalonDock.Themes.Aero/Brushes.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs b/source/Components/AvalonDock.Themes.Aero/Controls/SplineBorder.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs rename to source/Components/AvalonDock.Themes.Aero/Controls/SplineBorder.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableBottom.png b/source/Components/AvalonDock.Themes.Aero/Images/DockAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableBottom.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableLeft.png b/source/Components/AvalonDock.Themes.Aero/Images/DockAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableLeft.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableRight.png b/source/Components/AvalonDock.Themes.Aero/Images/DockAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableRight.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableTop.png b/source/Components/AvalonDock.Themes.Aero/Images/DockAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableTop.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableBottom.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableBottom.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableLeft.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableLeft.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableRight.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableRight.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableTop.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableTop.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentBottom.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentBottom.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentInside.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentInside.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentInside.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentInside.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentLeft.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentLeft.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentRight.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentRight.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentTop.png b/source/Components/AvalonDock.Themes.Aero/Images/DockDocumentTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentTop.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockDocumentTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneEmpty.png b/source/Components/AvalonDock.Themes.Aero/Images/DockPaneEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneEmpty.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockPaneEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneLargeEmpty.png b/source/Components/AvalonDock.Themes.Aero/Images/DockPaneLargeEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneLargeEmpty.png rename to source/Components/AvalonDock.Themes.Aero/Images/DockPaneLargeEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/HTabGroup.png b/source/Components/AvalonDock.Themes.Aero/Images/HTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/HTabGroup.png rename to source/Components/AvalonDock.Themes.Aero/Images/HTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/Locked.png b/source/Components/AvalonDock.Themes.Aero/Images/Locked.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/Locked.png rename to source/Components/AvalonDock.Themes.Aero/Images/Locked.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide.png b/source/Components/AvalonDock.Themes.Aero/Images/PinAutoHide.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinAutoHide.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Black.png b/source/Components/AvalonDock.Themes.Aero/Images/PinAutoHide_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Black.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinAutoHide_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Dark.png b/source/Components/AvalonDock.Themes.Aero/Images/PinAutoHide_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Dark.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinAutoHide_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose.png b/source/Components/AvalonDock.Themes.Aero/Images/PinClose.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinClose.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Black.png b/source/Components/AvalonDock.Themes.Aero/Images/PinClose_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Black.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinClose_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Dark.png b/source/Components/AvalonDock.Themes.Aero/Images/PinClose_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Dark.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinClose_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu.png b/source/Components/AvalonDock.Themes.Aero/Images/PinDocMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinDocMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Black.png b/source/Components/AvalonDock.Themes.Aero/Images/PinDocMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Black.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinDocMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Dark.png b/source/Components/AvalonDock.Themes.Aero/Images/PinDocMenu_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Dark.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinDocMenu_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize.png b/source/Components/AvalonDock.Themes.Aero/Images/PinMaximize.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinMaximize.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Black.png b/source/Components/AvalonDock.Themes.Aero/Images/PinMaximize_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Black.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinMaximize_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Dark.png b/source/Components/AvalonDock.Themes.Aero/Images/PinMaximize_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Dark.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinMaximize_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu.png b/source/Components/AvalonDock.Themes.Aero/Images/PinMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Black.png b/source/Components/AvalonDock.Themes.Aero/Images/PinMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Black.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Dark.png b/source/Components/AvalonDock.Themes.Aero/Images/PinMenu_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Dark.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinMenu_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore.png b/source/Components/AvalonDock.Themes.Aero/Images/PinRestore.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinRestore.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Black.png b/source/Components/AvalonDock.Themes.Aero/Images/PinRestore_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Black.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinRestore_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Dark.png b/source/Components/AvalonDock.Themes.Aero/Images/PinRestore_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Dark.png rename to source/Components/AvalonDock.Themes.Aero/Images/PinRestore_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/VTabGroup.png b/source/Components/AvalonDock.Themes.Aero/Images/VTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Images/VTabGroup.png rename to source/Components/AvalonDock.Themes.Aero/Images/VTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/LICENSE.txt b/source/Components/AvalonDock.Themes.Aero/LICENSE.txt similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/LICENSE.txt rename to source/Components/AvalonDock.Themes.Aero/LICENSE.txt diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/source/Components/AvalonDock.Themes.Aero/Theme.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml rename to source/Components/AvalonDock.Themes.Aero/Theme.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/sn.snk b/source/Components/AvalonDock.Themes.Aero/sn.snk similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/sn.snk rename to source/Components/AvalonDock.Themes.Aero/sn.snk diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj b/source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj rename to source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj index 663715f2..7c9698a4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj +++ b/source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj @@ -30,6 +30,6 @@ - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Controls/SplineBorder.cs b/source/Components/AvalonDock.Themes.Expression/Controls/SplineBorder.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Controls/SplineBorder.cs rename to source/Components/AvalonDock.Themes.Expression/Controls/SplineBorder.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/DarkBrushes.xaml b/source/Components/AvalonDock.Themes.Expression/DarkBrushes.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/DarkBrushes.xaml rename to source/Components/AvalonDock.Themes.Expression/DarkBrushes.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/DarkTheme.xaml b/source/Components/AvalonDock.Themes.Expression/DarkTheme.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/DarkTheme.xaml rename to source/Components/AvalonDock.Themes.Expression/DarkTheme.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs b/source/Components/AvalonDock.Themes.Expression/ExpressionDarkTheme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs rename to source/Components/AvalonDock.Themes.Expression/ExpressionDarkTheme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs b/source/Components/AvalonDock.Themes.Expression/ExpressionLightTheme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs rename to source/Components/AvalonDock.Themes.Expression/ExpressionLightTheme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockAnchorableBottom.png b/source/Components/AvalonDock.Themes.Expression/Images/DockAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockAnchorableBottom.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockAnchorableLeft.png b/source/Components/AvalonDock.Themes.Expression/Images/DockAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockAnchorableLeft.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockAnchorableRight.png b/source/Components/AvalonDock.Themes.Expression/Images/DockAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockAnchorableRight.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockAnchorableTop.png b/source/Components/AvalonDock.Themes.Expression/Images/DockAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockAnchorableTop.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableBottom.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableBottom.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableLeft.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableLeft.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableRight.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableRight.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableTop.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableTop.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentAsAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentBottom.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentBottom.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentInside.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentInside.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentInside.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentInside.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentLeft.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentLeft.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentRight.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentRight.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentTop.png b/source/Components/AvalonDock.Themes.Expression/Images/DockDocumentTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockDocumentTop.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockDocumentTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockPaneEmpty.png b/source/Components/AvalonDock.Themes.Expression/Images/DockPaneEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockPaneEmpty.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockPaneEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockPaneLargeEmpty.png b/source/Components/AvalonDock.Themes.Expression/Images/DockPaneLargeEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/DockPaneLargeEmpty.png rename to source/Components/AvalonDock.Themes.Expression/Images/DockPaneLargeEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/HTabGroup.png b/source/Components/AvalonDock.Themes.Expression/Images/HTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/HTabGroup.png rename to source/Components/AvalonDock.Themes.Expression/Images/HTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/Locked.png b/source/Components/AvalonDock.Themes.Expression/Images/Locked.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/Locked.png rename to source/Components/AvalonDock.Themes.Expression/Images/Locked.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinAutoHide.png b/source/Components/AvalonDock.Themes.Expression/Images/PinAutoHide.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinAutoHide.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinAutoHide.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinAutoHide_Black.png b/source/Components/AvalonDock.Themes.Expression/Images/PinAutoHide_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinAutoHide_Black.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinAutoHide_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinAutoHide_Dark.png b/source/Components/AvalonDock.Themes.Expression/Images/PinAutoHide_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinAutoHide_Dark.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinAutoHide_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinAutoHide_Light.png b/source/Components/AvalonDock.Themes.Expression/Images/PinAutoHide_Light.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinAutoHide_Light.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinAutoHide_Light.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinClose.png b/source/Components/AvalonDock.Themes.Expression/Images/PinClose.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinClose.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinClose.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinClose_Black.png b/source/Components/AvalonDock.Themes.Expression/Images/PinClose_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinClose_Black.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinClose_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinClose_Dark.png b/source/Components/AvalonDock.Themes.Expression/Images/PinClose_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinClose_Dark.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinClose_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinClose_Light.png b/source/Components/AvalonDock.Themes.Expression/Images/PinClose_Light.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinClose_Light.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinClose_Light.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinDocMenu_Black.png b/source/Components/AvalonDock.Themes.Expression/Images/PinDocMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinDocMenu_Black.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinDocMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinDocMenu_Dark.png b/source/Components/AvalonDock.Themes.Expression/Images/PinDocMenu_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinDocMenu_Dark.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinDocMenu_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMaximize.png b/source/Components/AvalonDock.Themes.Expression/Images/PinMaximize.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMaximize.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinMaximize.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMaximize_Black.png b/source/Components/AvalonDock.Themes.Expression/Images/PinMaximize_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMaximize_Black.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinMaximize_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMaximize_Dark.png b/source/Components/AvalonDock.Themes.Expression/Images/PinMaximize_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMaximize_Dark.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinMaximize_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMaximize_Light.png b/source/Components/AvalonDock.Themes.Expression/Images/PinMaximize_Light.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMaximize_Light.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinMaximize_Light.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMenu.png b/source/Components/AvalonDock.Themes.Expression/Images/PinMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMenu.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMenu_Black.png b/source/Components/AvalonDock.Themes.Expression/Images/PinMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMenu_Black.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMenu_Dark.png b/source/Components/AvalonDock.Themes.Expression/Images/PinMenu_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMenu_Dark.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinMenu_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMenu_Light.png b/source/Components/AvalonDock.Themes.Expression/Images/PinMenu_Light.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinMenu_Light.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinMenu_Light.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinRestore.png b/source/Components/AvalonDock.Themes.Expression/Images/PinRestore.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinRestore.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinRestore.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinRestore_Black.png b/source/Components/AvalonDock.Themes.Expression/Images/PinRestore_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinRestore_Black.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinRestore_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinRestore_Dark.png b/source/Components/AvalonDock.Themes.Expression/Images/PinRestore_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinRestore_Dark.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinRestore_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinRestore_Light.png b/source/Components/AvalonDock.Themes.Expression/Images/PinRestore_Light.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/PinRestore_Light.png rename to source/Components/AvalonDock.Themes.Expression/Images/PinRestore_Light.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/VTabGroup.png b/source/Components/AvalonDock.Themes.Expression/Images/VTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Images/VTabGroup.png rename to source/Components/AvalonDock.Themes.Expression/Images/VTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LICENSE.txt b/source/Components/AvalonDock.Themes.Expression/LICENSE.txt similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LICENSE.txt rename to source/Components/AvalonDock.Themes.Expression/LICENSE.txt diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightBrushes.xaml b/source/Components/AvalonDock.Themes.Expression/LightBrushes.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightBrushes.xaml rename to source/Components/AvalonDock.Themes.Expression/LightBrushes.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightTheme.xaml b/source/Components/AvalonDock.Themes.Expression/LightTheme.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightTheme.xaml rename to source/Components/AvalonDock.Themes.Expression/LightTheme.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml b/source/Components/AvalonDock.Themes.Expression/Theme.xaml similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml rename to source/Components/AvalonDock.Themes.Expression/Theme.xaml index 352f6a6a..d1539241 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml +++ b/source/Components/AvalonDock.Themes.Expression/Theme.xaml @@ -610,7 +610,7 @@ Command="{Binding Path=NewHorizontalTabGroupCommand}" Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"> - + @@ -618,7 +618,7 @@ Command="{Binding Path=NewVerticalTabGroupCommand}" Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"> - + - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml b/source/Components/AvalonDock.Themes.Metro/Brushes.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml rename to source/Components/AvalonDock.Themes.Metro/Brushes.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableBottom.png b/source/Components/AvalonDock.Themes.Metro/Images/DockAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableBottom.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableLeft.png b/source/Components/AvalonDock.Themes.Metro/Images/DockAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableLeft.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableRight.png b/source/Components/AvalonDock.Themes.Metro/Images/DockAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableRight.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableTop.png b/source/Components/AvalonDock.Themes.Metro/Images/DockAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableTop.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableBottom.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableBottom.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableLeft.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableLeft.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableRight.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableRight.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableTop.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableTop.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentBottom.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentBottom.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentInside.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentInside.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentInside.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentInside.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentLeft.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentLeft.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentRight.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentRight.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentTop.png b/source/Components/AvalonDock.Themes.Metro/Images/DockDocumentTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentTop.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockDocumentTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneEmpty.png b/source/Components/AvalonDock.Themes.Metro/Images/DockPaneEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneEmpty.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockPaneEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneLargeEmpty.png b/source/Components/AvalonDock.Themes.Metro/Images/DockPaneLargeEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneLargeEmpty.png rename to source/Components/AvalonDock.Themes.Metro/Images/DockPaneLargeEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/HTabGroup.png b/source/Components/AvalonDock.Themes.Metro/Images/HTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/HTabGroup.png rename to source/Components/AvalonDock.Themes.Metro/Images/HTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/Locked.png b/source/Components/AvalonDock.Themes.Metro/Images/Locked.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/Locked.png rename to source/Components/AvalonDock.Themes.Metro/Images/Locked.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide.png b/source/Components/AvalonDock.Themes.Metro/Images/PinAutoHide.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinAutoHide.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Black.png b/source/Components/AvalonDock.Themes.Metro/Images/PinAutoHide_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Black.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinAutoHide_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Dark.png b/source/Components/AvalonDock.Themes.Metro/Images/PinAutoHide_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Dark.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinAutoHide_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose.png b/source/Components/AvalonDock.Themes.Metro/Images/PinClose.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinClose.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Black.png b/source/Components/AvalonDock.Themes.Metro/Images/PinClose_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Black.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinClose_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Dark.png b/source/Components/AvalonDock.Themes.Metro/Images/PinClose_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Dark.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinClose_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu.png b/source/Components/AvalonDock.Themes.Metro/Images/PinDocMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinDocMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu_Black.png b/source/Components/AvalonDock.Themes.Metro/Images/PinDocMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu_Black.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinDocMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize.png b/source/Components/AvalonDock.Themes.Metro/Images/PinMaximize.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinMaximize.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Black.png b/source/Components/AvalonDock.Themes.Metro/Images/PinMaximize_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Black.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinMaximize_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Dark.png b/source/Components/AvalonDock.Themes.Metro/Images/PinMaximize_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Dark.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinMaximize_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu.png b/source/Components/AvalonDock.Themes.Metro/Images/PinMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Black.png b/source/Components/AvalonDock.Themes.Metro/Images/PinMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Black.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Dark.png b/source/Components/AvalonDock.Themes.Metro/Images/PinMenu_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Dark.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinMenu_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore.png b/source/Components/AvalonDock.Themes.Metro/Images/PinRestore.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinRestore.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Black.png b/source/Components/AvalonDock.Themes.Metro/Images/PinRestore_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Black.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinRestore_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Dark.png b/source/Components/AvalonDock.Themes.Metro/Images/PinRestore_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Dark.png rename to source/Components/AvalonDock.Themes.Metro/Images/PinRestore_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/VTabGroup.png b/source/Components/AvalonDock.Themes.Metro/Images/VTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Images/VTabGroup.png rename to source/Components/AvalonDock.Themes.Metro/Images/VTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/LICENSE.txt b/source/Components/AvalonDock.Themes.Metro/LICENSE.txt similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/LICENSE.txt rename to source/Components/AvalonDock.Themes.Metro/LICENSE.txt diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs b/source/Components/AvalonDock.Themes.Metro/MetroTheme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs rename to source/Components/AvalonDock.Themes.Metro/MetroTheme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/source/Components/AvalonDock.Themes.Metro/Theme.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml rename to source/Components/AvalonDock.Themes.Metro/Theme.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/sn.snk b/source/Components/AvalonDock.Themes.Metro/sn.snk similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/sn.snk rename to source/Components/AvalonDock.Themes.Metro/sn.snk diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj b/source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj rename to source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj index f0eba5f2..dac79cc7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj +++ b/source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj @@ -30,6 +30,6 @@ - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml b/source/Components/AvalonDock.Themes.VS2010/Brushes.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml rename to source/Components/AvalonDock.Themes.VS2010/Brushes.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableBottom.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableBottom.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableLeft.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableLeft.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableRight.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableRight.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableTop.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableTop.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableBottom.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableBottom.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableLeft.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableLeft.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableRight.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableRight.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableTop.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableTop.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentBottom.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentBottom.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentInside.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentInside.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentInside.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentInside.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentLeft.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentLeft.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentRight.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentRight.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentTop.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentTop.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockDocumentTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneEmpty.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockPaneEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneEmpty.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockPaneEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneLargeEmpty.png b/source/Components/AvalonDock.Themes.VS2010/Images/DockPaneLargeEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneLargeEmpty.png rename to source/Components/AvalonDock.Themes.VS2010/Images/DockPaneLargeEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/HTabGroup.png b/source/Components/AvalonDock.Themes.VS2010/Images/HTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/HTabGroup.png rename to source/Components/AvalonDock.Themes.VS2010/Images/HTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/Locked.png b/source/Components/AvalonDock.Themes.VS2010/Images/Locked.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/Locked.png rename to source/Components/AvalonDock.Themes.VS2010/Images/Locked.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinAutoHide.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinAutoHide.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Black.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinAutoHide_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Black.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinAutoHide_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Dark.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinAutoHide_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Dark.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinAutoHide_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinClose.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinClose.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Black.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinClose_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Black.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinClose_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Dark.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinClose_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Dark.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinClose_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinDocMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinDocMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu_Black.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinDocMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu_Black.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinDocMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinMaximize.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinMaximize.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Black.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinMaximize_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Black.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinMaximize_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Dark.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinMaximize_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Dark.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinMaximize_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Black.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Black.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Dark.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinMenu_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Dark.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinMenu_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinRestore.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinRestore.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Black.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinRestore_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Black.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinRestore_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Dark.png b/source/Components/AvalonDock.Themes.VS2010/Images/PinRestore_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Dark.png rename to source/Components/AvalonDock.Themes.VS2010/Images/PinRestore_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/VTabGroup.png b/source/Components/AvalonDock.Themes.VS2010/Images/VTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/VTabGroup.png rename to source/Components/AvalonDock.Themes.VS2010/Images/VTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/LICENSE.txt b/source/Components/AvalonDock.Themes.VS2010/LICENSE.txt similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/LICENSE.txt rename to source/Components/AvalonDock.Themes.VS2010/LICENSE.txt diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/source/Components/AvalonDock.Themes.VS2010/Theme.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml rename to source/Components/AvalonDock.Themes.VS2010/Theme.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs b/source/Components/AvalonDock.Themes.VS2010/VS2010Theme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs rename to source/Components/AvalonDock.Themes.VS2010/VS2010Theme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/sn.snk b/source/Components/AvalonDock.Themes.VS2010/sn.snk similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/sn.snk rename to source/Components/AvalonDock.Themes.VS2010/sn.snk diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj b/source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj rename to source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj index 0eed216d..5d7bd9bc 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj +++ b/source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj @@ -30,6 +30,6 @@ - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueBrushs.xaml b/source/Components/AvalonDock.Themes.VS2013/BlueBrushs.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueBrushs.xaml rename to source/Components/AvalonDock.Themes.VS2013/BlueBrushs.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml b/source/Components/AvalonDock.Themes.VS2013/BlueTheme.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml rename to source/Components/AvalonDock.Themes.VS2013/BlueTheme.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkBrushs.xaml b/source/Components/AvalonDock.Themes.VS2013/DarkBrushs.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkBrushs.xaml rename to source/Components/AvalonDock.Themes.VS2013/DarkBrushs.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml b/source/Components/AvalonDock.Themes.VS2013/DarkTheme.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml rename to source/Components/AvalonDock.Themes.VS2013/DarkTheme.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockAnchorableBottom.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockAnchorableBottom.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockAnchorableLeft.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockAnchorableLeft.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockAnchorableRight.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockAnchorableRight.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockAnchorableTop.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockAnchorableTop.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableBottom.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableBottom.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableLeft.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableLeft.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableRight.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableRight.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableTop.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableTop.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentAsAnchorableTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentBottom.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentBottom.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentInside.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentInside.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentInside.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentInside.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentLeft.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentLeft.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentRight.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentRight.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentTop.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockDocumentTop.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockDocumentTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockPaneEmpty.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockPaneEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockPaneEmpty.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockPaneEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockPaneLargeEmpty.png b/source/Components/AvalonDock.Themes.VS2013/Images/DockPaneLargeEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/DockPaneLargeEmpty.png rename to source/Components/AvalonDock.Themes.VS2013/Images/DockPaneLargeEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/HTabGroup.png b/source/Components/AvalonDock.Themes.VS2013/Images/HTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/HTabGroup.png rename to source/Components/AvalonDock.Themes.VS2013/Images/HTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/Locked.png b/source/Components/AvalonDock.Themes.VS2013/Images/Locked.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/Locked.png rename to source/Components/AvalonDock.Themes.VS2013/Images/Locked.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinAutoHide.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinAutoHide.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinAutoHide.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinAutoHide.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinAutoHide_Black.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinAutoHide_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinAutoHide_Black.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinAutoHide_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinAutoHide_Dark.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinAutoHide_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinAutoHide_Dark.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinAutoHide_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinAutoHide_White.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinAutoHide_White.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinAutoHide_White.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinAutoHide_White.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinClose.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinClose.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinClose.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinClose.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinClose_Black.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinClose_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinClose_Black.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinClose_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinClose_Dark.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinClose_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinClose_Dark.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinClose_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinClose_White.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinClose_White.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinClose_White.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinClose_White.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinDocMenu.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinDocMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinDocMenu.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinDocMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinDocMenu_Black.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinDocMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinDocMenu_Black.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinDocMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMaximize.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinMaximize.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMaximize.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinMaximize.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMaximize_Black.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinMaximize_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMaximize_Black.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinMaximize_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMaximize_Dark.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinMaximize_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMaximize_Dark.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinMaximize_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMenu.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMenu.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMenu_Black.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinMenu_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMenu_Black.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinMenu_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMenu_Dark.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinMenu_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMenu_Dark.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinMenu_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMenu_White.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinMenu_White.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinMenu_White.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinMenu_White.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinRestore.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinRestore.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinRestore.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinRestore.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinRestore_Black.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinRestore_Black.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinRestore_Black.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinRestore_Black.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinRestore_Dark.png b/source/Components/AvalonDock.Themes.VS2013/Images/PinRestore_Dark.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/PinRestore_Dark.png rename to source/Components/AvalonDock.Themes.VS2013/Images/PinRestore_Dark.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/VTabGroup.png b/source/Components/AvalonDock.Themes.VS2013/Images/VTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Images/VTabGroup.png rename to source/Components/AvalonDock.Themes.VS2013/Images/VTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LICENSE.txt b/source/Components/AvalonDock.Themes.VS2013/LICENSE.txt similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LICENSE.txt rename to source/Components/AvalonDock.Themes.VS2013/LICENSE.txt diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightBrushs.xaml b/source/Components/AvalonDock.Themes.VS2013/LightBrushs.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightBrushs.xaml rename to source/Components/AvalonDock.Themes.VS2013/LightBrushs.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml b/source/Components/AvalonDock.Themes.VS2013/LightTheme.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml rename to source/Components/AvalonDock.Themes.VS2013/LightTheme.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/OverlayButtons.xaml b/source/Components/AvalonDock.Themes.VS2013/OverlayButtons.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/OverlayButtons.xaml rename to source/Components/AvalonDock.Themes.VS2013/OverlayButtons.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml rename to source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml rename to source/Components/AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/LightBrushs.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Menu/LightBrushs.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/LightBrushs.xaml rename to source/Components/AvalonDock.Themes.VS2013/Themes/Menu/LightBrushs.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuItem.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Menu/MenuItem.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuItem.xaml rename to source/Components/AvalonDock.Themes.VS2013/Themes/Menu/MenuItem.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs b/source/Components/AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs rename to source/Components/AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs b/source/Components/AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs rename to source/Components/AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs b/source/Components/AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs rename to source/Components/AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs b/source/Components/AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs rename to source/Components/AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013LightTheme.cs b/source/Components/AvalonDock.Themes.VS2013/Vs2013LightTheme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013LightTheme.cs rename to source/Components/AvalonDock.Themes.VS2013/Vs2013LightTheme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/sn.snk b/source/Components/AvalonDock.Themes.VS2013/sn.snk similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/sn.snk rename to source/Components/AvalonDock.Themes.VS2013/sn.snk diff --git a/source/Components/Xceed.Wpf.AvalonDock/AvalonDock.csproj b/source/Components/AvalonDock/AvalonDock.csproj similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/AvalonDock.csproj rename to source/Components/AvalonDock/AvalonDock.csproj diff --git a/source/Components/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs b/source/Components/AvalonDock/Commands/RelayCommand.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs rename to source/Components/AvalonDock/Commands/RelayCommand.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs b/source/Components/AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs rename to source/Components/AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs b/source/Components/AvalonDock/Controls/AnchorablePaneDropTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs rename to source/Components/AvalonDock/Controls/AnchorablePaneDropTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs b/source/Components/AvalonDock/Controls/AnchorablePaneTabPanel.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs rename to source/Components/AvalonDock/Controls/AnchorablePaneTabPanel.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs b/source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs rename to source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs b/source/Components/AvalonDock/Controls/AutoHideWindowManager.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs rename to source/Components/AvalonDock/Controls/AutoHideWindowManager.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs b/source/Components/AvalonDock/Controls/BindingHelper.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs rename to source/Components/AvalonDock/Controls/BindingHelper.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs b/source/Components/AvalonDock/Controls/ContextMenuEx.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs rename to source/Components/AvalonDock/Controls/ContextMenuEx.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs b/source/Components/AvalonDock/Controls/DockingManagerDropTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs rename to source/Components/AvalonDock/Controls/DockingManagerDropTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs b/source/Components/AvalonDock/Controls/DockingManagerOverlayArea.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs rename to source/Components/AvalonDock/Controls/DockingManagerOverlayArea.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs b/source/Components/AvalonDock/Controls/DocumentPaneControlOverlayArea.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs rename to source/Components/AvalonDock/Controls/DocumentPaneControlOverlayArea.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs rename to source/Components/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs rename to source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs rename to source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs b/source/Components/AvalonDock/Controls/DocumentPaneTabPanel.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs rename to source/Components/AvalonDock/Controls/DocumentPaneTabPanel.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DragService.cs b/source/Components/AvalonDock/Controls/DragService.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DragService.cs rename to source/Components/AvalonDock/Controls/DragService.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropArea.cs b/source/Components/AvalonDock/Controls/DropArea.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropArea.cs rename to source/Components/AvalonDock/Controls/DropArea.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs b/source/Components/AvalonDock/Controls/DropDownButton.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs rename to source/Components/AvalonDock/Controls/DropDownButton.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs b/source/Components/AvalonDock/Controls/DropDownControlArea.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs rename to source/Components/AvalonDock/Controls/DropDownControlArea.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs b/source/Components/AvalonDock/Controls/DropTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs rename to source/Components/AvalonDock/Controls/DropTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs b/source/Components/AvalonDock/Controls/DropTargetBase.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs rename to source/Components/AvalonDock/Controls/DropTargetBase.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs b/source/Components/AvalonDock/Controls/DropTargetType.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs rename to source/Components/AvalonDock/Controls/DropTargetType.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Extentions.cs b/source/Components/AvalonDock/Controls/Extentions.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Extentions.cs rename to source/Components/AvalonDock/Controls/Extentions.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs b/source/Components/AvalonDock/Controls/FocusElementManager.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs rename to source/Components/AvalonDock/Controls/FocusElementManager.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs b/source/Components/AvalonDock/Controls/FullWeakDictionary.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs rename to source/Components/AvalonDock/Controls/FullWeakDictionary.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs b/source/Components/AvalonDock/Controls/IDropTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs rename to source/Components/AvalonDock/Controls/IDropTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs b/source/Components/AvalonDock/Controls/IOverlayWindow.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs rename to source/Components/AvalonDock/Controls/IOverlayWindow.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs b/source/Components/AvalonDock/Controls/IOverlayWindowArea.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs rename to source/Components/AvalonDock/Controls/IOverlayWindowArea.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs b/source/Components/AvalonDock/Controls/IOverlayWindowDropTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs rename to source/Components/AvalonDock/Controls/IOverlayWindowDropTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs b/source/Components/AvalonDock/Controls/IOverlayWindowHost.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs rename to source/Components/AvalonDock/Controls/IOverlayWindowHost.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorGroupControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorGroupControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorSideControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorSideControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableItem.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorableItem.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs similarity index 96% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs index 23091f4e..1b545e69 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs @@ -1,105 +1,105 @@ -/************************************************************************ - AvalonDock - - 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 https://opensource.org/licenses/MS-PL - ************************************************************************/ - -using System; -using System.Windows.Controls; -using System.Windows; -using System.Windows.Data; -using AvalonDock.Layout; - -namespace AvalonDock.Controls -{ - public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer - { - #region Members - - private LayoutAnchorablePane _model; - - #endregion - - #region Constructors - - static LayoutAnchorablePaneControl() - { - FocusableProperty.OverrideMetadata(typeof(LayoutAnchorablePaneControl), new FrameworkPropertyMetadata(false)); - } - - public LayoutAnchorablePaneControl(LayoutAnchorablePane model) - { - if (model == null) - throw new ArgumentNullException("model"); - - _model = model; - - SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this }); - SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this }); - - // Handle SizeChanged event instead of LayoutUpdated. It will exlude fluctuations of Actual size values. - // this.LayoutUpdated += new EventHandler( OnLayoutUpdated ); - this.SizeChanged += OnSizeChanged; - } - - #endregion - - #region Properties - - public ILayoutElement Model - { - get - { - return _model; - } - } - - #endregion - - #region Overrides - - protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e) - { - if ((_model != null) && (_model.SelectedContent != null)) - { - _model.SelectedContent.IsActive = true; - } - - base.OnGotKeyboardFocus(e); - } - - protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e) - { - base.OnMouseLeftButtonDown(e); - - if (!e.Handled && (_model != null) && _model.SelectedContent != null) - _model.SelectedContent.IsActive = true; - } - - protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e) - { - base.OnMouseRightButtonDown(e); - - if (!e.Handled && (_model != null) && _model.SelectedContent != null) - _model.SelectedContent.IsActive = true; - - } - - - #endregion - - #region Private Methods - - private void OnSizeChanged(object sender, SizeChangedEventArgs e) - { - var modelWithActualSize = _model as ILayoutPositionableElementWithActualSize; - modelWithActualSize.ActualWidth = ActualWidth; - modelWithActualSize.ActualHeight = ActualHeight; - } - - #endregion - } -} +/************************************************************************ + AvalonDock + + 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 https://opensource.org/licenses/MS-PL + ************************************************************************/ + +using System; +using System.Windows.Controls; +using System.Windows; +using System.Windows.Data; +using AvalonDock.Layout; + +namespace AvalonDock.Controls +{ + public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer + { + #region Members + + private LayoutAnchorablePane _model; + + #endregion + + #region Constructors + + static LayoutAnchorablePaneControl() + { + FocusableProperty.OverrideMetadata(typeof(LayoutAnchorablePaneControl), new FrameworkPropertyMetadata(false)); + } + + public LayoutAnchorablePaneControl(LayoutAnchorablePane model) + { + if (model == null) + throw new ArgumentNullException("model"); + + _model = model; + + SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this }); + SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this }); + + // Handle SizeChanged event instead of LayoutUpdated. It will exlude fluctuations of Actual size values. + // this.LayoutUpdated += new EventHandler( OnLayoutUpdated ); + this.SizeChanged += OnSizeChanged; + } + + #endregion + + #region Properties + + public ILayoutElement Model + { + get + { + return _model; + } + } + + #endregion + + #region Overrides + + protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e) + { + if ((_model != null) && (_model.SelectedContent != null)) + { + _model.SelectedContent.IsActive = true; + } + + base.OnGotKeyboardFocus(e); + } + + protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e) + { + base.OnMouseLeftButtonDown(e); + + if (!e.Handled && (_model != null) && _model.SelectedContent != null) + _model.SelectedContent.IsActive = true; + } + + protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e) + { + base.OnMouseRightButtonDown(e); + + if (!e.Handled && (_model != null) && _model.SelectedContent != null) + _model.SelectedContent.IsActive = true; + + } + + + #endregion + + #region Private Methods + + private void OnSizeChanged(object sender, SizeChangedEventArgs e) + { + var modelWithActualSize = _model as ILayoutPositionableElementWithActualSize; + modelWithActualSize.ActualWidth = ActualWidth; + modelWithActualSize.ActualHeight = ActualHeight; + } + + #endregion + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableTabItem.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorableTabItem.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutAutoHideWindowControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs rename to source/Components/AvalonDock/Controls/LayoutAutoHideWindowControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs b/source/Components/AvalonDock/Controls/LayoutDocumentItem.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentItem.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs similarity index 96% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs index ebe7345e..293d51aa 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs @@ -1,112 +1,112 @@ -/************************************************************************ - AvalonDock - - 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 https://opensource.org/licenses/MS-PL - ************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using AvalonDock.Layout; - -namespace AvalonDock.Controls -{ - public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer - { - #region Members - - private List _logicalChildren = new List(); - private LayoutDocumentPane _model; - - #endregion - - #region Constructors - - static LayoutDocumentPaneControl() - { - FocusableProperty.OverrideMetadata(typeof(LayoutDocumentPaneControl), new FrameworkPropertyMetadata(false)); - } - - internal LayoutDocumentPaneControl(LayoutDocumentPane model) - { - if (model == null) - throw new ArgumentNullException("model"); - - _model = model; - SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this }); - SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this }); - - // Handle SizeChanged event instead of LayoutUpdated. It will exlude fluctuations of Actual size values. - // this.LayoutUpdated += new EventHandler( OnLayoutUpdated ); - this.SizeChanged += OnSizeChanged; - } - - #endregion - - #region Properties - - public ILayoutElement Model - { - get - { - return _model; - } - } - - #endregion - - #region Overrides - - protected override System.Collections.IEnumerator LogicalChildren - { - get - { - return _logicalChildren.GetEnumerator(); - } - } - - protected override void OnSelectionChanged(SelectionChangedEventArgs e) - { - base.OnSelectionChanged(e); - - if (_model.SelectedContent != null) - _model.SelectedContent.IsActive = true; - } - - protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e) - { - base.OnMouseLeftButtonDown(e); - - if (!e.Handled && _model.SelectedContent != null) - _model.SelectedContent.IsActive = true; - } - - protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e) - { - base.OnMouseRightButtonDown(e); - - if (!e.Handled && _model.SelectedContent != null) - _model.SelectedContent.IsActive = true; - - } - - - #endregion - - #region Private Methods - - private void OnSizeChanged(object sender, SizeChangedEventArgs e) - { - var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize; - modelWithAtcualSize.ActualWidth = ActualWidth; - modelWithAtcualSize.ActualHeight = ActualHeight; - } - - #endregion - } -} +/************************************************************************ + AvalonDock + + 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 https://opensource.org/licenses/MS-PL + ************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using AvalonDock.Layout; + +namespace AvalonDock.Controls +{ + public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer + { + #region Members + + private List _logicalChildren = new List(); + private LayoutDocumentPane _model; + + #endregion + + #region Constructors + + static LayoutDocumentPaneControl() + { + FocusableProperty.OverrideMetadata(typeof(LayoutDocumentPaneControl), new FrameworkPropertyMetadata(false)); + } + + internal LayoutDocumentPaneControl(LayoutDocumentPane model) + { + if (model == null) + throw new ArgumentNullException("model"); + + _model = model; + SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this }); + SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this }); + + // Handle SizeChanged event instead of LayoutUpdated. It will exlude fluctuations of Actual size values. + // this.LayoutUpdated += new EventHandler( OnLayoutUpdated ); + this.SizeChanged += OnSizeChanged; + } + + #endregion + + #region Properties + + public ILayoutElement Model + { + get + { + return _model; + } + } + + #endregion + + #region Overrides + + protected override System.Collections.IEnumerator LogicalChildren + { + get + { + return _logicalChildren.GetEnumerator(); + } + } + + protected override void OnSelectionChanged(SelectionChangedEventArgs e) + { + base.OnSelectionChanged(e); + + if (_model.SelectedContent != null) + _model.SelectedContent.IsActive = true; + } + + protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e) + { + base.OnMouseLeftButtonDown(e); + + if (!e.Handled && _model.SelectedContent != null) + _model.SelectedContent.IsActive = true; + } + + protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e) + { + base.OnMouseRightButtonDown(e); + + if (!e.Handled && _model.SelectedContent != null) + _model.SelectedContent.IsActive = true; + + } + + + #endregion + + #region Private Methods + + private void OnSizeChanged(object sender, SizeChangedEventArgs e) + { + var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize; + modelWithAtcualSize.ActualWidth = ActualWidth; + modelWithAtcualSize.ActualHeight = ActualHeight; + } + + #endregion + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs b/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutFloatingWindowControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs rename to source/Components/AvalonDock/Controls/LayoutFloatingWindowControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs b/source/Components/AvalonDock/Controls/LayoutGridControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs rename to source/Components/AvalonDock/Controls/LayoutGridControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs b/source/Components/AvalonDock/Controls/LayoutGridResizerControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs rename to source/Components/AvalonDock/Controls/LayoutGridResizerControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/source/Components/AvalonDock/Controls/LayoutItem.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs rename to source/Components/AvalonDock/Controls/LayoutItem.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs b/source/Components/AvalonDock/Controls/LayoutPanelControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs rename to source/Components/AvalonDock/Controls/LayoutPanelControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs b/source/Components/AvalonDock/Controls/MenuItemEx.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs rename to source/Components/AvalonDock/Controls/MenuItemEx.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs b/source/Components/AvalonDock/Controls/NavigatorWindow.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs rename to source/Components/AvalonDock/Controls/NavigatorWindow.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs b/source/Components/AvalonDock/Controls/OverlayArea.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs rename to source/Components/AvalonDock/Controls/OverlayArea.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs b/source/Components/AvalonDock/Controls/OverlayWindow.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs rename to source/Components/AvalonDock/Controls/OverlayWindow.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs b/source/Components/AvalonDock/Controls/OverlayWindowDropTarget.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs rename to source/Components/AvalonDock/Controls/OverlayWindowDropTarget.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs b/source/Components/AvalonDock/Controls/OverlayWindowDropTargetType.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs rename to source/Components/AvalonDock/Controls/OverlayWindowDropTargetType.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs b/source/Components/AvalonDock/Controls/ReentrantFlag.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs rename to source/Components/AvalonDock/Controls/ReentrantFlag.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Debug.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/Debug.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs b/source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs b/source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs b/source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs b/source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs b/source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Utilities.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/Utilities.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Verify.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/Verify.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs b/source/Components/AvalonDock/Controls/Shell/SystemCommands.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs rename to source/Components/AvalonDock/Controls/Shell/SystemCommands.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs b/source/Components/AvalonDock/Controls/Shell/SystemParameters2.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs rename to source/Components/AvalonDock/Controls/Shell/SystemParameters2.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs b/source/Components/AvalonDock/Controls/Shell/WindowChrome.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs rename to source/Components/AvalonDock/Controls/Shell/WindowChrome.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs b/source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs rename to source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs b/source/Components/AvalonDock/Controls/TransformExtentions.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs rename to source/Components/AvalonDock/Controls/TransformExtentions.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs b/source/Components/AvalonDock/Controls/WeakDictionary.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs rename to source/Components/AvalonDock/Controls/WeakDictionary.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs b/source/Components/AvalonDock/Controls/WindowActivateEventArgs.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs rename to source/Components/AvalonDock/Controls/WindowActivateEventArgs.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs b/source/Components/AvalonDock/Controls/WindowHookHandler.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs rename to source/Components/AvalonDock/Controls/WindowHookHandler.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs rename to source/Components/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs b/source/Components/AvalonDock/Converters/AnchorSideToAngleConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs rename to source/Components/AvalonDock/Converters/AnchorSideToAngleConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs b/source/Components/AvalonDock/Converters/AnchorSideToOrientationConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs rename to source/Components/AvalonDock/Converters/AnchorSideToOrientationConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs b/source/Components/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs rename to source/Components/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs rename to source/Components/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs b/source/Components/AvalonDock/Converters/BoolToVisibilityConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs rename to source/Components/AvalonDock/Converters/BoolToVisibilityConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs rename to source/Components/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs b/source/Components/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs rename to source/Components/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs b/source/Components/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs rename to source/Components/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs b/source/Components/AvalonDock/Converters/NullToDoNothingConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs rename to source/Components/AvalonDock/Converters/NullToDoNothingConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs b/source/Components/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs rename to source/Components/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs b/source/Components/AvalonDock/DockingManager.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs rename to source/Components/AvalonDock/DockingManager.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs b/source/Components/AvalonDock/DocumentClosedEventArgs.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs rename to source/Components/AvalonDock/DocumentClosedEventArgs.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs b/source/Components/AvalonDock/DocumentClosingEventArgs.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs rename to source/Components/AvalonDock/DocumentClosingEventArgs.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Extentions.cs b/source/Components/AvalonDock/Extentions.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Extentions.cs rename to source/Components/AvalonDock/Extentions.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/LICENSE.txt b/source/Components/AvalonDock/LICENSE.txt similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/LICENSE.txt rename to source/Components/AvalonDock/LICENSE.txt diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs b/source/Components/AvalonDock/Layout/AnchorSide.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs rename to source/Components/AvalonDock/Layout/AnchorSide.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs b/source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs rename to source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs b/source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs rename to source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/Extentions.cs b/source/Components/AvalonDock/Layout/Extentions.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/Extentions.cs rename to source/Components/AvalonDock/Layout/Extentions.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs b/source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs rename to source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs b/source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs rename to source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs b/source/Components/AvalonDock/Layout/ILayoutContainer.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs rename to source/Components/AvalonDock/Layout/ILayoutContainer.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs b/source/Components/AvalonDock/Layout/ILayoutContentSelector.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs rename to source/Components/AvalonDock/Layout/ILayoutContentSelector.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs b/source/Components/AvalonDock/Layout/ILayoutControl.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs rename to source/Components/AvalonDock/Layout/ILayoutControl.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs b/source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs rename to source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs b/source/Components/AvalonDock/Layout/ILayoutElement.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs rename to source/Components/AvalonDock/Layout/ILayoutElement.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs b/source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs rename to source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs b/source/Components/AvalonDock/Layout/ILayoutElementWithVisibility.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs rename to source/Components/AvalonDock/Layout/ILayoutElementWithVisibility.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs b/source/Components/AvalonDock/Layout/ILayoutGroup.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs rename to source/Components/AvalonDock/Layout/ILayoutGroup.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs b/source/Components/AvalonDock/Layout/ILayoutOrientableElement.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs rename to source/Components/AvalonDock/Layout/ILayoutOrientableElement.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs b/source/Components/AvalonDock/Layout/ILayoutPane.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs rename to source/Components/AvalonDock/Layout/ILayoutPane.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs b/source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs rename to source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs b/source/Components/AvalonDock/Layout/ILayoutPanelElement.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs rename to source/Components/AvalonDock/Layout/ILayoutPanelElement.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs b/source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs rename to source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs b/source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs rename to source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs b/source/Components/AvalonDock/Layout/ILayoutRoot.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs rename to source/Components/AvalonDock/Layout/ILayoutRoot.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs b/source/Components/AvalonDock/Layout/ILayoutUpdateStrategy.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs rename to source/Components/AvalonDock/Layout/ILayoutUpdateStrategy.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs b/source/Components/AvalonDock/Layout/LayoutAnchorGroup.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorGroup.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs b/source/Components/AvalonDock/Layout/LayoutAnchorSide.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorSide.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs b/source/Components/AvalonDock/Layout/LayoutAnchorable.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorable.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs b/source/Components/AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs b/source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs b/source/Components/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/source/Components/AvalonDock/Layout/LayoutContent.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs rename to source/Components/AvalonDock/Layout/LayoutContent.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs b/source/Components/AvalonDock/Layout/LayoutDocument.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs rename to source/Components/AvalonDock/Layout/LayoutDocument.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs b/source/Components/AvalonDock/Layout/LayoutDocumentFloatingWindow.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs rename to source/Components/AvalonDock/Layout/LayoutDocumentFloatingWindow.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs b/source/Components/AvalonDock/Layout/LayoutDocumentPane.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs rename to source/Components/AvalonDock/Layout/LayoutDocumentPane.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs b/source/Components/AvalonDock/Layout/LayoutDocumentPaneGroup.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs rename to source/Components/AvalonDock/Layout/LayoutDocumentPaneGroup.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs b/source/Components/AvalonDock/Layout/LayoutElement.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs rename to source/Components/AvalonDock/Layout/LayoutElement.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs b/source/Components/AvalonDock/Layout/LayoutElementEventArgs.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs rename to source/Components/AvalonDock/Layout/LayoutElementEventArgs.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs b/source/Components/AvalonDock/Layout/LayoutFloatingWindow.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs rename to source/Components/AvalonDock/Layout/LayoutFloatingWindow.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs b/source/Components/AvalonDock/Layout/LayoutGroup.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs rename to source/Components/AvalonDock/Layout/LayoutGroup.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs b/source/Components/AvalonDock/Layout/LayoutGroupBase.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs rename to source/Components/AvalonDock/Layout/LayoutGroupBase.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs b/source/Components/AvalonDock/Layout/LayoutPanel.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs rename to source/Components/AvalonDock/Layout/LayoutPanel.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs b/source/Components/AvalonDock/Layout/LayoutPositionableGroup.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs rename to source/Components/AvalonDock/Layout/LayoutPositionableGroup.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/source/Components/AvalonDock/Layout/LayoutRoot.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs rename to source/Components/AvalonDock/Layout/LayoutRoot.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs b/source/Components/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs rename to source/Components/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs b/source/Components/AvalonDock/Layout/Serialization/LayoutSerializer.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs rename to source/Components/AvalonDock/Layout/Serialization/LayoutSerializer.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs b/source/Components/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs rename to source/Components/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs b/source/Components/AvalonDock/LayoutEventArgs.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs rename to source/Components/AvalonDock/LayoutEventArgs.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs b/source/Components/AvalonDock/MathHelper.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs rename to source/Components/AvalonDock/MathHelper.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/source/Components/AvalonDock/Properties/AssemblyInfo.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock/Properties/AssemblyInfo.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs b/source/Components/AvalonDock/Properties/Resources.Designer.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs rename to source/Components/AvalonDock/Properties/Resources.Designer.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ca-ES.resx b/source/Components/AvalonDock/Properties/Resources.ca-ES.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ca-ES.resx rename to source/Components/AvalonDock/Properties/Resources.ca-ES.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.resx b/source/Components/AvalonDock/Properties/Resources.cs-CZ.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.resx rename to source/Components/AvalonDock/Properties/Resources.cs-CZ.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.de.resx b/source/Components/AvalonDock/Properties/Resources.de.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.de.resx rename to source/Components/AvalonDock/Properties/Resources.de.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.es.resx b/source/Components/AvalonDock/Properties/Resources.es.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.es.resx rename to source/Components/AvalonDock/Properties/Resources.es.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.fr.resx b/source/Components/AvalonDock/Properties/Resources.fr.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.fr.resx rename to source/Components/AvalonDock/Properties/Resources.fr.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.hu.resx b/source/Components/AvalonDock/Properties/Resources.hu.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.hu.resx rename to source/Components/AvalonDock/Properties/Resources.hu.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.it.resx b/source/Components/AvalonDock/Properties/Resources.it.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.it.resx rename to source/Components/AvalonDock/Properties/Resources.it.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ja.resx b/source/Components/AvalonDock/Properties/Resources.ja.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ja.resx rename to source/Components/AvalonDock/Properties/Resources.ja.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ko.resx b/source/Components/AvalonDock/Properties/Resources.ko.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ko.resx rename to source/Components/AvalonDock/Properties/Resources.ko.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx b/source/Components/AvalonDock/Properties/Resources.nl-BE.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx rename to source/Components/AvalonDock/Properties/Resources.nl-BE.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.pl.resx b/source/Components/AvalonDock/Properties/Resources.pl.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.pl.resx rename to source/Components/AvalonDock/Properties/Resources.pl.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.resx b/source/Components/AvalonDock/Properties/Resources.pt-BR.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.resx rename to source/Components/AvalonDock/Properties/Resources.pt-BR.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.resx b/source/Components/AvalonDock/Properties/Resources.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.resx rename to source/Components/AvalonDock/Properties/Resources.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ro.resx b/source/Components/AvalonDock/Properties/Resources.ro.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ro.resx rename to source/Components/AvalonDock/Properties/Resources.ro.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ru.resx b/source/Components/AvalonDock/Properties/Resources.ru.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.ru.resx rename to source/Components/AvalonDock/Properties/Resources.ru.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.sv.resx b/source/Components/AvalonDock/Properties/Resources.sv.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.sv.resx rename to source/Components/AvalonDock/Properties/Resources.sv.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.resx b/source/Components/AvalonDock/Properties/Resources.zh-Hans.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.resx rename to source/Components/AvalonDock/Properties/Resources.zh-Hans.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hant.resx b/source/Components/AvalonDock/Properties/Resources.zh-Hant.resx similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hant.resx rename to source/Components/AvalonDock/Properties/Resources.zh-Hant.resx diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs b/source/Components/AvalonDock/Themes/DictionaryTheme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs rename to source/Components/AvalonDock/Themes/DictionaryTheme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockBottom.PNG b/source/Components/AvalonDock/Themes/Generic/Images/DockBottom.PNG similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockBottom.PNG rename to source/Components/AvalonDock/Themes/Generic/Images/DockBottom.PNG diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockLeft.PNG b/source/Components/AvalonDock/Themes/Generic/Images/DockLeft.PNG similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockLeft.PNG rename to source/Components/AvalonDock/Themes/Generic/Images/DockLeft.PNG diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPane.PNG b/source/Components/AvalonDock/Themes/Generic/Images/DockPane.PNG similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPane.PNG rename to source/Components/AvalonDock/Themes/Generic/Images/DockPane.PNG diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPaneEmpty.png b/source/Components/AvalonDock/Themes/Generic/Images/DockPaneEmpty.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPaneEmpty.png rename to source/Components/AvalonDock/Themes/Generic/Images/DockPaneEmpty.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockRight.PNG b/source/Components/AvalonDock/Themes/Generic/Images/DockRight.PNG similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockRight.PNG rename to source/Components/AvalonDock/Themes/Generic/Images/DockRight.PNG diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockTop.PNG b/source/Components/AvalonDock/Themes/Generic/Images/DockTop.PNG similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockTop.PNG rename to source/Components/AvalonDock/Themes/Generic/Images/DockTop.PNG diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/HTabGroup.png b/source/Components/AvalonDock/Themes/Generic/Images/HTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/HTabGroup.png rename to source/Components/AvalonDock/Themes/Generic/Images/HTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneBottom.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockDocPaneBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneBottom.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockDocPaneBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneLeft.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockDocPaneLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneLeft.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockDocPaneLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneRight.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockDocPaneRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneRight.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockDocPaneRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneTop.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockDocPaneTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneTop.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockDocPaneTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneBottom.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneBottom.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneBottom.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneBottom.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneInside.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneInside.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneInside.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneInside.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneLeft.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneLeft.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneLeft.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneLeft.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneRight.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneRight.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneRight.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneRight.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneTop.png b/source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneTop.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneTop.png rename to source/Components/AvalonDock/Themes/Generic/Images/InnerDockPaneTop.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/Locked.png b/source/Components/AvalonDock/Themes/Generic/Images/Locked.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/Locked.png rename to source/Components/AvalonDock/Themes/Generic/Images/Locked.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinAutoHide.png b/source/Components/AvalonDock/Themes/Generic/Images/PinAutoHide.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinAutoHide.png rename to source/Components/AvalonDock/Themes/Generic/Images/PinAutoHide.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinClose.png b/source/Components/AvalonDock/Themes/Generic/Images/PinClose.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinClose.png rename to source/Components/AvalonDock/Themes/Generic/Images/PinClose.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinDocMenu.png b/source/Components/AvalonDock/Themes/Generic/Images/PinDocMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinDocMenu.png rename to source/Components/AvalonDock/Themes/Generic/Images/PinDocMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMaximize.png b/source/Components/AvalonDock/Themes/Generic/Images/PinMaximize.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMaximize.png rename to source/Components/AvalonDock/Themes/Generic/Images/PinMaximize.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMenu.png b/source/Components/AvalonDock/Themes/Generic/Images/PinMenu.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMenu.png rename to source/Components/AvalonDock/Themes/Generic/Images/PinMenu.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinRestore.png b/source/Components/AvalonDock/Themes/Generic/Images/PinRestore.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinRestore.png rename to source/Components/AvalonDock/Themes/Generic/Images/PinRestore.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/VTabGroup.png b/source/Components/AvalonDock/Themes/Generic/Images/VTabGroup.png similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Generic/Images/VTabGroup.png rename to source/Components/AvalonDock/Themes/Generic/Images/VTabGroup.png diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs b/source/Components/AvalonDock/Themes/GenericTheme.cs similarity index 68% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs rename to source/Components/AvalonDock/Themes/GenericTheme.cs index 4199ab87..60f550ab 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs +++ b/source/Components/AvalonDock/Themes/GenericTheme.cs @@ -11,11 +11,11 @@ This program is provided to you under the terms of the Microsoft Public namespace AvalonDock.Themes { - public class GenericTheme : Theme - { - public override Uri GetResourceUri() + public class GenericTheme : Theme { - return new Uri( "/Xceed.Wpf.AvalonDock;component/Themes/generic.xaml", UriKind.Relative ); + public override Uri GetResourceUri() + { + return new Uri("/AvalonDock;component/Themes/generic.xaml", UriKind.Relative); + } } - } -} +} \ No newline at end of file diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs b/source/Components/AvalonDock/Themes/Theme.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs rename to source/Components/AvalonDock/Themes/Theme.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml b/source/Components/AvalonDock/Themes/generic.xaml similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml rename to source/Components/AvalonDock/Themes/generic.xaml diff --git a/source/Components/Xceed.Wpf.AvalonDock/Win32Helper.cs b/source/Components/AvalonDock/Win32Helper.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/Win32Helper.cs rename to source/Components/AvalonDock/Win32Helper.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/WindowHelper.cs b/source/Components/AvalonDock/WindowHelper.cs similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/WindowHelper.cs rename to source/Components/AvalonDock/WindowHelper.cs diff --git a/source/Components/Xceed.Wpf.AvalonDock/sn.snk b/source/Components/AvalonDock/sn.snk similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock/sn.snk rename to source/Components/AvalonDock/sn.snk diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs index 65daf3d7..cc1121ee 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs @@ -1,186 +1,186 @@ namespace AvalonDock.Tools { - using MLibTest.Demos.ViewModels.Interfaces; - using System; - using System.Windows.Media.Imaging; - using System.Windows.Media; - using System.Windows.Input; - using MLibTest.ViewModels.Base; - using MLib.Interfaces; - using Settings.Interfaces; - using MLibTest.Demos.ViewModels.AD; - - /// - /// Implements the viewmodel that drives the view a Color Picker tool window. - /// - /// https://github.com/Dirkster99/ColorPickerLib - /// - internal class ColorPickerViewModel : ToolViewModel - { - #region fields - /// - /// Identifies the of this tool window. - /// - public const string ToolContentId = "ColorPickerTool"; - - /// - /// Identifies the caption string used for this tool window. - /// - public const string ToolTitle = "Color Picker"; - - private IWorkSpaceViewModel _workSpaceViewModel = null; - - private Color _SelectedBackgroundColor; - private Color _SelectedAccentColor; - private ICommand _ResetAccentColorCommand; - #endregion fields - - #region constructors - /// - /// Class constructor - /// - /// Is the link to the application's viewmodel - /// to enable (event based) communication between this viewmodel and the application. - public ColorPickerViewModel(IWorkSpaceViewModel workSpaceViewModel) - : base(ToolTitle) - { - _workSpaceViewModel = workSpaceViewModel; - - SetupADToolDefaults(); - SetupToolDefaults(); - } - - /// - /// Hidden default class constructor - /// - protected ColorPickerViewModel() - : base(ToolTitle) - { - SetupADToolDefaults(); - SetupToolDefaults(); - } - #endregion constructors - - #region properties - /// - /// Gets/sets the currently selected accent color for the color picker in the tool window's view. - /// - public Color SelectedBackgroundColor - { - get { return _SelectedBackgroundColor; } - set - { - if (_SelectedBackgroundColor != value) - { - _SelectedBackgroundColor = value; - RaisePropertyChanged(() => SelectedBackgroundColor); - } - } - } - - /// - /// Gets/sets the currently selected accent color for the color picker in the tool window's view. - /// - public Color SelectedAccentColor - { - get { return _SelectedAccentColor; } - set - { - if (_SelectedAccentColor != value) - { - _SelectedAccentColor = value; - RaisePropertyChanged(() => SelectedAccentColor); - } - } - } - - /// - /// Gets a command to reset the currently selected accent color - /// and reloads all current resources to make sure that the - /// accent is changed consistently. - /// - public ICommand ResetAccentColorCommand - { - get - { - if (_ResetAccentColorCommand == null) - { - _ResetAccentColorCommand = new RelayCommand((p) => - { - if ((p is Color) == false) - return; - - Color accentColor = (Color)p; - - var appearance = GetService(); - var settings = GetService(); // add the default themes - - // 1) You could use this if you where using MLib only - // appearance.SetAccentColor(accentColor); - - // 2) But you should use this if you use MLib with additional libraries - // with additional accent colors to be synchronized at run-time - appearance.SetTheme(settings.Themes - , appearance.ThemeName - , accentColor); - - // 3 You could also use something like this to change accent color - // If you were using your own Theming Framework or MUI, Mahapps etc - // - //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - - }); - } - - return _ResetAccentColorCommand; - } - } - - /// - /// Gets a human readable description for the property. - /// - public string SelectedAccentColorDescription - { - get - { - return "Define a custom color."; - } - } - #endregion properties - - #region methods - /// - /// Initialize Avalondock specific defaults that are specific to this tool window. - /// - private void SetupADToolDefaults() - { - ContentId = ToolContentId; // Define a unique contentid for this toolwindow - - BitmapImage bi = new BitmapImage(); // Define an icon for this toolwindow - bi.BeginInit(); - bi.UriSource = new Uri("pack://application:,,/Demos/Images/property-blue.png"); - bi.EndInit(); - IconSource = bi; - } - - /// - /// Initialize non-Avalondock defaults that are specific to this tool window. - /// - private void SetupToolDefaults() - { - SelectedBackgroundColor = Color.FromArgb(255, 0, 0, 0); - SelectedAccentColor = Color.FromArgb(128, 0, 180, 0); - } - #endregion methods - } -} + using MLibTest.Demos.ViewModels.Interfaces; + using System; + using System.Windows.Media.Imaging; + using System.Windows.Media; + using System.Windows.Input; + using MLibTest.ViewModels.Base; + using MLib.Interfaces; + using Settings.Interfaces; + using MLibTest.Demos.ViewModels.AD; + + /// + /// Implements the viewmodel that drives the view a Color Picker tool window. + /// + /// https://github.com/Dirkster99/ColorPickerLib + /// + internal class ColorPickerViewModel : ToolViewModel + { + #region fields + /// + /// Identifies the of this tool window. + /// + public const string ToolContentId = "ColorPickerTool"; + + /// + /// Identifies the caption string used for this tool window. + /// + public const string ToolTitle = "Color Picker"; + + private IWorkSpaceViewModel _workSpaceViewModel = null; + + private Color _SelectedBackgroundColor; + private Color _SelectedAccentColor; + private ICommand _ResetAccentColorCommand; + #endregion fields + + #region constructors + /// + /// Class constructor + /// + /// Is the link to the application's viewmodel + /// to enable (event based) communication between this viewmodel and the application. + public ColorPickerViewModel(IWorkSpaceViewModel workSpaceViewModel) + : base(ToolTitle) + { + _workSpaceViewModel = workSpaceViewModel; + + SetupADToolDefaults(); + SetupToolDefaults(); + } + + /// + /// Hidden default class constructor + /// + protected ColorPickerViewModel() + : base(ToolTitle) + { + SetupADToolDefaults(); + SetupToolDefaults(); + } + #endregion constructors + + #region properties + /// + /// Gets/sets the currently selected accent color for the color picker in the tool window's view. + /// + public Color SelectedBackgroundColor + { + get { return _SelectedBackgroundColor; } + set + { + if (_SelectedBackgroundColor != value) + { + _SelectedBackgroundColor = value; + RaisePropertyChanged(() => SelectedBackgroundColor); + } + } + } + + /// + /// Gets/sets the currently selected accent color for the color picker in the tool window's view. + /// + public Color SelectedAccentColor + { + get { return _SelectedAccentColor; } + set + { + if (_SelectedAccentColor != value) + { + _SelectedAccentColor = value; + RaisePropertyChanged(() => SelectedAccentColor); + } + } + } + + /// + /// Gets a command to reset the currently selected accent color + /// and reloads all current resources to make sure that the + /// accent is changed consistently. + /// + public ICommand ResetAccentColorCommand + { + get + { + if (_ResetAccentColorCommand == null) + { + _ResetAccentColorCommand = new RelayCommand((p) => + { + if ((p is Color) == false) + return; + + Color accentColor = (Color)p; + + var appearance = GetService(); + var settings = GetService(); // add the default themes + + // 1) You could use this if you where using MLib only + // appearance.SetAccentColor(accentColor); + + // 2) But you should use this if you use MLib with additional libraries + // with additional accent colors to be synchronized at run-time + appearance.SetTheme(settings.Themes + , appearance.ThemeName + , accentColor); + + // 3 You could also use something like this to change accent color + // If you were using your own Theming Framework or MUI, Mahapps etc + // + //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + + }); + } + + return _ResetAccentColorCommand; + } + } + + /// + /// Gets a human readable description for the property. + /// + public string SelectedAccentColorDescription + { + get + { + return "Define a custom color."; + } + } + #endregion properties + + #region methods + /// + /// Initialize Avalondock specific defaults that are specific to this tool window. + /// + private void SetupADToolDefaults() + { + ContentId = ToolContentId; // Define a unique contentid for this toolwindow + + BitmapImage bi = new BitmapImage(); // Define an icon for this toolwindow + bi.BeginInit(); + bi.UriSource = new Uri("pack://application:,,/Demos/Images/property-blue.png"); + bi.EndInit(); + IconSource = bi; + } + + /// + /// Initialize non-Avalondock defaults that are specific to this tool window. + /// + private void SetupToolDefaults() + { + SelectedBackgroundColor = Color.FromArgb(255, 0, 0, 0); + SelectedAccentColor = Color.FromArgb(128, 0, 180, 0); + } + #endregion methods + } +} \ No newline at end of file diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs index 83055ce1..e20c82a2 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs @@ -1,184 +1,184 @@ namespace AvalonDock.Tools { - using MLibTest.Demos.ViewModels.Interfaces; - using System; - using System.Windows.Media.Imaging; - using System.Windows.Media; - using System.Windows.Input; - using MLibTest.ViewModels.Base; - using MLib.Interfaces; - using Settings.Interfaces; - using MLibTest.Demos.ViewModels.AD; - - /// - /// Implements the viewmodel that drives a sample tool window view. - /// - internal class Tool1_ViewModel : ToolViewModel - { - #region fields - /// - /// Identifies the of this tool window. - /// - public const string ToolContentId = "Tool1_Tool"; - - /// - /// Identifies the caption string used for this tool window. - /// - public const string ToolTitle = "Tool 1"; - - private IWorkSpaceViewModel _workSpaceViewModel = null; - - private Color _SelectedBackgroundColor; - private Color _SelectedAccentColor; - private ICommand _ResetAccentColorCommand; - #endregion fields - - #region constructors - /// - /// Class constructor - /// - /// Is the link to the application's viewmodel - /// to enable (event based) communication between this viewmodel and the application. - public Tool1_ViewModel(IWorkSpaceViewModel workSpaceViewModel) - : base(ToolTitle) - { - _workSpaceViewModel = workSpaceViewModel; - - SetupADToolDefaults(); - SetupToolDefaults(); - } - - /// - /// Hidden default class constructor - /// - protected Tool1_ViewModel() - : base(ToolTitle) - { - SetupADToolDefaults(); - SetupToolDefaults(); - } - #endregion constructors - - #region properties - /// - /// Gets/sets the currently selected accent color for the color picker in the tool window's view. - /// - public Color SelectedBackgroundColor - { - get { return _SelectedBackgroundColor; } - set - { - if (_SelectedBackgroundColor != value) - { - _SelectedBackgroundColor = value; - RaisePropertyChanged(() => SelectedBackgroundColor); - } - } - } - - /// - /// Gets/sets the currently selected accent color for the color picker in the tool window's view. - /// - public Color SelectedAccentColor - { - get { return _SelectedAccentColor; } - set - { - if (_SelectedAccentColor != value) - { - _SelectedAccentColor = value; - RaisePropertyChanged(() => SelectedAccentColor); - } - } - } - - /// - /// Gets a command to reset the currently selected accent color - /// and reloads all current resources to make sure that the - /// accent is changed consistently. - /// - public ICommand ResetAccentColorCommand - { - get - { - if (_ResetAccentColorCommand == null) - { - _ResetAccentColorCommand = new RelayCommand((p) => - { - if ((p is Color) == false) - return; - - Color accentColor = (Color)p; - - var appearance = GetService(); - var settings = GetService(); // add the default themes - - // 1) You could use this if you where using MLib only - // appearance.SetAccentColor(accentColor); - - // 2) But you should use this if you use MLib with additional libraries - // with additional accent colors to be synchronized at run-time - appearance.SetTheme(settings.Themes - , appearance.ThemeName - , accentColor); - - // 3 You could also use something like this to change accent color - // If you were using your own Theming Framework or MUI, Mahapps etc - // - //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - - }); - } - - return _ResetAccentColorCommand; - } - } - - /// - /// Gets a human readable description for the property. - /// - public string SelectedAccentColorDescription - { - get - { - return "Define a custom color."; - } - } - #endregion properties - - #region methods - /// - /// Initialize Avalondock specific defaults that are specific to this tool window. - /// - private void SetupADToolDefaults() - { - ContentId = ToolContentId; // Define a unique contentid for this toolwindow - - BitmapImage bi = new BitmapImage(); // Define an icon for this toolwindow - bi.BeginInit(); - bi.UriSource = new Uri("pack://application:,,/Demos/Images/property-blue.png"); - bi.EndInit(); - IconSource = bi; - } - - /// - /// Initialize non-Avalondock defaults that are specific to this tool window. - /// - private void SetupToolDefaults() - { - SelectedBackgroundColor = Color.FromArgb(255, 0, 0, 0); - SelectedAccentColor = Color.FromArgb(128, 0, 180, 0); - } - #endregion methods - } -} + using MLibTest.Demos.ViewModels.Interfaces; + using System; + using System.Windows.Media.Imaging; + using System.Windows.Media; + using System.Windows.Input; + using MLibTest.ViewModels.Base; + using MLib.Interfaces; + using Settings.Interfaces; + using MLibTest.Demos.ViewModels.AD; + + /// + /// Implements the viewmodel that drives a sample tool window view. + /// + internal class Tool1_ViewModel : ToolViewModel + { + #region fields + /// + /// Identifies the of this tool window. + /// + public const string ToolContentId = "Tool1_Tool"; + + /// + /// Identifies the caption string used for this tool window. + /// + public const string ToolTitle = "Tool 1"; + + private IWorkSpaceViewModel _workSpaceViewModel = null; + + private Color _SelectedBackgroundColor; + private Color _SelectedAccentColor; + private ICommand _ResetAccentColorCommand; + #endregion fields + + #region constructors + /// + /// Class constructor + /// + /// Is the link to the application's viewmodel + /// to enable (event based) communication between this viewmodel and the application. + public Tool1_ViewModel(IWorkSpaceViewModel workSpaceViewModel) + : base(ToolTitle) + { + _workSpaceViewModel = workSpaceViewModel; + + SetupADToolDefaults(); + SetupToolDefaults(); + } + + /// + /// Hidden default class constructor + /// + protected Tool1_ViewModel() + : base(ToolTitle) + { + SetupADToolDefaults(); + SetupToolDefaults(); + } + #endregion constructors + + #region properties + /// + /// Gets/sets the currently selected accent color for the color picker in the tool window's view. + /// + public Color SelectedBackgroundColor + { + get { return _SelectedBackgroundColor; } + set + { + if (_SelectedBackgroundColor != value) + { + _SelectedBackgroundColor = value; + RaisePropertyChanged(() => SelectedBackgroundColor); + } + } + } + + /// + /// Gets/sets the currently selected accent color for the color picker in the tool window's view. + /// + public Color SelectedAccentColor + { + get { return _SelectedAccentColor; } + set + { + if (_SelectedAccentColor != value) + { + _SelectedAccentColor = value; + RaisePropertyChanged(() => SelectedAccentColor); + } + } + } + + /// + /// Gets a command to reset the currently selected accent color + /// and reloads all current resources to make sure that the + /// accent is changed consistently. + /// + public ICommand ResetAccentColorCommand + { + get + { + if (_ResetAccentColorCommand == null) + { + _ResetAccentColorCommand = new RelayCommand((p) => + { + if ((p is Color) == false) + return; + + Color accentColor = (Color)p; + + var appearance = GetService(); + var settings = GetService(); // add the default themes + + // 1) You could use this if you where using MLib only + // appearance.SetAccentColor(accentColor); + + // 2) But you should use this if you use MLib with additional libraries + // with additional accent colors to be synchronized at run-time + appearance.SetTheme(settings.Themes + , appearance.ThemeName + , accentColor); + + // 3 You could also use something like this to change accent color + // If you were using your own Theming Framework or MUI, Mahapps etc + // + //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + + }); + } + + return _ResetAccentColorCommand; + } + } + + /// + /// Gets a human readable description for the property. + /// + public string SelectedAccentColorDescription + { + get + { + return "Define a custom color."; + } + } + #endregion properties + + #region methods + /// + /// Initialize Avalondock specific defaults that are specific to this tool window. + /// + private void SetupADToolDefaults() + { + ContentId = ToolContentId; // Define a unique contentid for this toolwindow + + BitmapImage bi = new BitmapImage(); // Define an icon for this toolwindow + bi.BeginInit(); + bi.UriSource = new Uri("pack://application:,,/Demos/Images/property-blue.png"); + bi.EndInit(); + IconSource = bi; + } + + /// + /// Initialize non-Avalondock defaults that are specific to this tool window. + /// + private void SetupToolDefaults() + { + SelectedBackgroundColor = Color.FromArgb(255, 0, 0, 0); + SelectedAccentColor = Color.FromArgb(128, 0, 180, 0); + } + #endregion methods + } +} \ No newline at end of file diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs index 615dacbe..699856e7 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs @@ -1,184 +1,184 @@ namespace AvalonDock.Tools { - using MLibTest.Demos.ViewModels.Interfaces; - using System; - using System.Windows.Media.Imaging; - using System.Windows.Media; - using System.Windows.Input; - using MLibTest.ViewModels.Base; - using MLib.Interfaces; - using Settings.Interfaces; - using MLibTest.Demos.ViewModels.AD; - - /// - /// Implements the viewmodel that drives a sample tool window view. - /// - internal class Tool2_ViewModel : ToolViewModel - { - #region fields - /// - /// Identifies the of this tool window. - /// - public const string ToolContentId = "Tool2_Tool"; - - /// - /// Identifies the caption string used for this tool window. - /// - public const string ToolTitle = "Tool 2"; - - private IWorkSpaceViewModel _workSpaceViewModel = null; - - private Color _SelectedBackgroundColor; - private Color _SelectedAccentColor; - private ICommand _ResetAccentColorCommand; - #endregion fields - - #region constructors - /// - /// Class constructor - /// - /// Is the link to the application's viewmodel - /// to enable (event based) communication between this viewmodel and the application. - public Tool2_ViewModel(IWorkSpaceViewModel workSpaceViewModel) - : base(ToolTitle) - { - _workSpaceViewModel = workSpaceViewModel; - - SetupADToolDefaults(); - SetupToolDefaults(); - } - - /// - /// Hidden default class constructor - /// - protected Tool2_ViewModel() - : base(ToolTitle) - { - SetupADToolDefaults(); - SetupToolDefaults(); - } - #endregion constructors - - #region properties - /// - /// Gets/sets the currently selected accent color for the color picker in the tool window's view. - /// - public Color SelectedBackgroundColor - { - get { return _SelectedBackgroundColor; } - set - { - if (_SelectedBackgroundColor != value) - { - _SelectedBackgroundColor = value; - RaisePropertyChanged(() => SelectedBackgroundColor); - } - } - } - - /// - /// Gets/sets the currently selected accent color for the color picker in the tool window's view. - /// - public Color SelectedAccentColor - { - get { return _SelectedAccentColor; } - set - { - if (_SelectedAccentColor != value) - { - _SelectedAccentColor = value; - RaisePropertyChanged(() => SelectedAccentColor); - } - } - } - - /// - /// Gets a command to reset the currently selected accent color - /// and reloads all current resources to make sure that the - /// accent is changed consistently. - /// - public ICommand ResetAccentColorCommand - { - get - { - if (_ResetAccentColorCommand == null) - { - _ResetAccentColorCommand = new RelayCommand((p) => - { - if ((p is Color) == false) - return; - - Color accentColor = (Color)p; - - var appearance = GetService(); - var settings = GetService(); // add the default themes - - // 1) You could use this if you where using MLib only - // appearance.SetAccentColor(accentColor); - - // 2) But you should use this if you use MLib with additional libraries - // with additional accent colors to be synchronized at run-time - appearance.SetTheme(settings.Themes - , appearance.ThemeName - , accentColor); - - // 3 You could also use something like this to change accent color - // If you were using your own Theming Framework or MUI, Mahapps etc - // - //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - - }); - } - - return _ResetAccentColorCommand; - } - } - - /// - /// Gets a human readable description for the property. - /// - public string SelectedAccentColorDescription - { - get - { - return "Define a custom color."; - } - } - #endregion properties - - #region methods - /// - /// Initialize Avalondock specific defaults that are specific to this tool window. - /// - private void SetupADToolDefaults() - { - ContentId = ToolContentId; // Define a unique contentid for this toolwindow - - BitmapImage bi = new BitmapImage(); // Define an icon for this toolwindow - bi.BeginInit(); - bi.UriSource = new Uri("pack://application:,,/Demos/Images/property-blue.png"); - bi.EndInit(); - IconSource = bi; - } - - /// - /// Initialize non-Avalondock defaults that are specific to this tool window. - /// - private void SetupToolDefaults() - { - SelectedBackgroundColor = Color.FromArgb(255, 0, 0, 0); - SelectedAccentColor = Color.FromArgb(128, 0, 180, 0); - } - #endregion methods - } -} + using MLibTest.Demos.ViewModels.Interfaces; + using System; + using System.Windows.Media.Imaging; + using System.Windows.Media; + using System.Windows.Input; + using MLibTest.ViewModels.Base; + using MLib.Interfaces; + using Settings.Interfaces; + using MLibTest.Demos.ViewModels.AD; + + /// + /// Implements the viewmodel that drives a sample tool window view. + /// + internal class Tool2_ViewModel : ToolViewModel + { + #region fields + /// + /// Identifies the of this tool window. + /// + public const string ToolContentId = "Tool2_Tool"; + + /// + /// Identifies the caption string used for this tool window. + /// + public const string ToolTitle = "Tool 2"; + + private IWorkSpaceViewModel _workSpaceViewModel = null; + + private Color _SelectedBackgroundColor; + private Color _SelectedAccentColor; + private ICommand _ResetAccentColorCommand; + #endregion fields + + #region constructors + /// + /// Class constructor + /// + /// Is the link to the application's viewmodel + /// to enable (event based) communication between this viewmodel and the application. + public Tool2_ViewModel(IWorkSpaceViewModel workSpaceViewModel) + : base(ToolTitle) + { + _workSpaceViewModel = workSpaceViewModel; + + SetupADToolDefaults(); + SetupToolDefaults(); + } + + /// + /// Hidden default class constructor + /// + protected Tool2_ViewModel() + : base(ToolTitle) + { + SetupADToolDefaults(); + SetupToolDefaults(); + } + #endregion constructors + + #region properties + /// + /// Gets/sets the currently selected accent color for the color picker in the tool window's view. + /// + public Color SelectedBackgroundColor + { + get { return _SelectedBackgroundColor; } + set + { + if (_SelectedBackgroundColor != value) + { + _SelectedBackgroundColor = value; + RaisePropertyChanged(() => SelectedBackgroundColor); + } + } + } + + /// + /// Gets/sets the currently selected accent color for the color picker in the tool window's view. + /// + public Color SelectedAccentColor + { + get { return _SelectedAccentColor; } + set + { + if (_SelectedAccentColor != value) + { + _SelectedAccentColor = value; + RaisePropertyChanged(() => SelectedAccentColor); + } + } + } + + /// + /// Gets a command to reset the currently selected accent color + /// and reloads all current resources to make sure that the + /// accent is changed consistently. + /// + public ICommand ResetAccentColorCommand + { + get + { + if (_ResetAccentColorCommand == null) + { + _ResetAccentColorCommand = new RelayCommand((p) => + { + if ((p is Color) == false) + return; + + Color accentColor = (Color)p; + + var appearance = GetService(); + var settings = GetService(); // add the default themes + + // 1) You could use this if you where using MLib only + // appearance.SetAccentColor(accentColor); + + // 2) But you should use this if you use MLib with additional libraries + // with additional accent colors to be synchronized at run-time + appearance.SetTheme(settings.Themes + , appearance.ThemeName + , accentColor); + + // 3 You could also use something like this to change accent color + // If you were using your own Theming Framework or MUI, Mahapps etc + // + //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + + }); + } + + return _ResetAccentColorCommand; + } + } + + /// + /// Gets a human readable description for the property. + /// + public string SelectedAccentColorDescription + { + get + { + return "Define a custom color."; + } + } + #endregion properties + + #region methods + /// + /// Initialize Avalondock specific defaults that are specific to this tool window. + /// + private void SetupADToolDefaults() + { + ContentId = ToolContentId; // Define a unique contentid for this toolwindow + + BitmapImage bi = new BitmapImage(); // Define an icon for this toolwindow + bi.BeginInit(); + bi.UriSource = new Uri("pack://application:,,/Demos/Images/property-blue.png"); + bi.EndInit(); + IconSource = bi; + } + + /// + /// Initialize non-Avalondock defaults that are specific to this tool window. + /// + private void SetupToolDefaults() + { + SelectedBackgroundColor = Color.FromArgb(255, 0, 0, 0); + SelectedAccentColor = Color.FromArgb(128, 0, 180, 0); + } + #endregion methods + } +} \ No newline at end of file diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs index 01477334..0e3d8020 100644 --- a/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs +++ b/source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs @@ -1,184 +1,184 @@ namespace AvalonDock.Tools { - using MLibTest.Demos.ViewModels.Interfaces; - using System; - using System.Windows.Media.Imaging; - using System.Windows.Media; - using System.Windows.Input; - using MLibTest.ViewModels.Base; - using MLib.Interfaces; - using Settings.Interfaces; - using MLibTest.Demos.ViewModels.AD; - - /// - /// Implements the viewmodel that drives a sample tool window view. - /// - internal class Tool3_ViewModel : ToolViewModel - { - #region fields - /// - /// Identifies the of this tool window. - /// - public const string ToolContentId = "Tool3_Tool"; - - /// - /// Identifies the caption string used for this tool window. - /// - public const string ToolTitle = "Tool 3"; - - private IWorkSpaceViewModel _workSpaceViewModel = null; - - private Color _SelectedBackgroundColor; - private Color _SelectedAccentColor; - private ICommand _ResetAccentColorCommand; - #endregion fields - - #region constructors - /// - /// Class constructor - /// - /// Is the link to the application's viewmodel - /// to enable (event based) communication between this viewmodel and the application. - public Tool3_ViewModel(IWorkSpaceViewModel workSpaceViewModel) - : base(ToolTitle) - { - _workSpaceViewModel = workSpaceViewModel; - - SetupADToolDefaults(); - SetupToolDefaults(); - } - - /// - /// Hidden default class constructor - /// - protected Tool3_ViewModel() - : base(ToolTitle) - { - SetupADToolDefaults(); - SetupToolDefaults(); - } - #endregion constructors - - #region properties - /// - /// Gets/sets the currently selected accent color for the color picker in the tool window's view. - /// - public Color SelectedBackgroundColor - { - get { return _SelectedBackgroundColor; } - set - { - if (_SelectedBackgroundColor != value) - { - _SelectedBackgroundColor = value; - RaisePropertyChanged(() => SelectedBackgroundColor); - } - } - } - - /// - /// Gets/sets the currently selected accent color for the color picker in the tool window's view. - /// - public Color SelectedAccentColor - { - get { return _SelectedAccentColor; } - set - { - if (_SelectedAccentColor != value) - { - _SelectedAccentColor = value; - RaisePropertyChanged(() => SelectedAccentColor); - } - } - } - - /// - /// Gets a command to reset the currently selected accent color - /// and reloads all current resources to make sure that the - /// accent is changed consistently. - /// - public ICommand ResetAccentColorCommand - { - get - { - if (_ResetAccentColorCommand == null) - { - _ResetAccentColorCommand = new RelayCommand((p) => - { - if ((p is Color) == false) - return; - - Color accentColor = (Color)p; - - var appearance = GetService(); - var settings = GetService(); // add the default themes - - // 1) You could use this if you where using MLib only - // appearance.SetAccentColor(accentColor); - - // 2) But you should use this if you use MLib with additional libraries - // with additional accent colors to be synchronized at run-time - appearance.SetTheme(settings.Themes - , appearance.ThemeName - , accentColor); - - // 3 You could also use something like this to change accent color - // If you were using your own Theming Framework or MUI, Mahapps etc - // - //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[Xceed.Wpf.AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - //// - //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; - //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); - - }); - } - - return _ResetAccentColorCommand; - } - } - - /// - /// Gets a human readable description for the property. - /// - public string SelectedAccentColorDescription - { - get - { - return "Define a custom color."; - } - } - #endregion properties - - #region methods - /// - /// Initialize Avalondock specific defaults that are specific to this tool window. - /// - private void SetupADToolDefaults() - { - ContentId = ToolContentId; // Define a unique contentid for this toolwindow - - BitmapImage bi = new BitmapImage(); // Define an icon for this toolwindow - bi.BeginInit(); - bi.UriSource = new Uri("pack://application:,,/Demos/Images/property-blue.png"); - bi.EndInit(); - IconSource = bi; - } - - /// - /// Initialize non-Avalondock defaults that are specific to this tool window. - /// - private void SetupToolDefaults() - { - SelectedBackgroundColor = Color.FromArgb(255, 0, 0, 0); - SelectedAccentColor = Color.FromArgb(128, 0, 180, 0); - } - #endregion methods - } -} + using MLibTest.Demos.ViewModels.Interfaces; + using System; + using System.Windows.Media.Imaging; + using System.Windows.Media; + using System.Windows.Input; + using MLibTest.ViewModels.Base; + using MLib.Interfaces; + using Settings.Interfaces; + using MLibTest.Demos.ViewModels.AD; + + /// + /// Implements the viewmodel that drives a sample tool window view. + /// + internal class Tool3_ViewModel : ToolViewModel + { + #region fields + /// + /// Identifies the of this tool window. + /// + public const string ToolContentId = "Tool3_Tool"; + + /// + /// Identifies the caption string used for this tool window. + /// + public const string ToolTitle = "Tool 3"; + + private IWorkSpaceViewModel _workSpaceViewModel = null; + + private Color _SelectedBackgroundColor; + private Color _SelectedAccentColor; + private ICommand _ResetAccentColorCommand; + #endregion fields + + #region constructors + /// + /// Class constructor + /// + /// Is the link to the application's viewmodel + /// to enable (event based) communication between this viewmodel and the application. + public Tool3_ViewModel(IWorkSpaceViewModel workSpaceViewModel) + : base(ToolTitle) + { + _workSpaceViewModel = workSpaceViewModel; + + SetupADToolDefaults(); + SetupToolDefaults(); + } + + /// + /// Hidden default class constructor + /// + protected Tool3_ViewModel() + : base(ToolTitle) + { + SetupADToolDefaults(); + SetupToolDefaults(); + } + #endregion constructors + + #region properties + /// + /// Gets/sets the currently selected accent color for the color picker in the tool window's view. + /// + public Color SelectedBackgroundColor + { + get { return _SelectedBackgroundColor; } + set + { + if (_SelectedBackgroundColor != value) + { + _SelectedBackgroundColor = value; + RaisePropertyChanged(() => SelectedBackgroundColor); + } + } + } + + /// + /// Gets/sets the currently selected accent color for the color picker in the tool window's view. + /// + public Color SelectedAccentColor + { + get { return _SelectedAccentColor; } + set + { + if (_SelectedAccentColor != value) + { + _SelectedAccentColor = value; + RaisePropertyChanged(() => SelectedAccentColor); + } + } + } + + /// + /// Gets a command to reset the currently selected accent color + /// and reloads all current resources to make sure that the + /// accent is changed consistently. + /// + public ICommand ResetAccentColorCommand + { + get + { + if (_ResetAccentColorCommand == null) + { + _ResetAccentColorCommand = new RelayCommand((p) => + { + if ((p is Color) == false) + return; + + Color accentColor = (Color)p; + + var appearance = GetService(); + var settings = GetService(); // add the default themes + + // 1) You could use this if you where using MLib only + // appearance.SetAccentColor(accentColor); + + // 2) But you should use this if you use MLib with additional libraries + // with additional accent colors to be synchronized at run-time + appearance.SetTheme(settings.Themes + , appearance.ThemeName + , accentColor); + + // 3 You could also use something like this to change accent color + // If you were using your own Theming Framework or MUI, Mahapps etc + // + //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[MWindowLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[MLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[AvalonDock.Themes.VS2013.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + //// + //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentColorKey] = accentColor; + //// Application.Current.Resources[NumericUpDownLib.Themes.ResourceKeys.ControlAccentBrushKey] = new SolidColorBrush(accentColor); + + }); + } + + return _ResetAccentColorCommand; + } + } + + /// + /// Gets a human readable description for the property. + /// + public string SelectedAccentColorDescription + { + get + { + return "Define a custom color."; + } + } + #endregion properties + + #region methods + /// + /// Initialize Avalondock specific defaults that are specific to this tool window. + /// + private void SetupADToolDefaults() + { + ContentId = ToolContentId; // Define a unique contentid for this toolwindow + + BitmapImage bi = new BitmapImage(); // Define an icon for this toolwindow + bi.BeginInit(); + bi.UriSource = new Uri("pack://application:,,/Demos/Images/property-blue.png"); + bi.EndInit(); + IconSource = bi; + } + + /// + /// Initialize non-Avalondock defaults that are specific to this tool window. + /// + private void SetupToolDefaults() + { + SelectedBackgroundColor = Color.FromArgb(255, 0, 0, 0); + SelectedAccentColor = Color.FromArgb(128, 0, 180, 0); + } + #endregion methods + } +} \ No newline at end of file diff --git a/source/MLibTest/MLibTest/MLibTest.csproj b/source/MLibTest/MLibTest/MLibTest.csproj index a75a90d9..f642dc7c 100644 --- a/source/MLibTest/MLibTest/MLibTest.csproj +++ b/source/MLibTest/MLibTest/MLibTest.csproj @@ -24,10 +24,10 @@ - - - - + + + + diff --git a/source/MVVMTestApp/App.xaml b/source/MVVMTestApp/App.xaml index 0b839eaa..c087d643 100644 --- a/source/MVVMTestApp/App.xaml +++ b/source/MVVMTestApp/App.xaml @@ -3,6 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StartupUri="MainWindow.xaml"> - + diff --git a/source/MVVMTestApp/MVVMTestApp.csproj b/source/MVVMTestApp/MVVMTestApp.csproj index d0cc3ffd..5bb78ef0 100644 --- a/source/MVVMTestApp/MVVMTestApp.csproj +++ b/source/MVVMTestApp/MVVMTestApp.csproj @@ -12,7 +12,7 @@ - + diff --git a/source/TestApp/App.xaml b/source/TestApp/App.xaml index 8564a274..a4e41940 100644 --- a/source/TestApp/App.xaml +++ b/source/TestApp/App.xaml @@ -12,6 +12,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StartupUri="MainWindow.xaml"> - + diff --git a/source/TestApp/TestApp.csproj b/source/TestApp/TestApp.csproj index 8c9842d4..264aeebc 100644 --- a/source/TestApp/TestApp.csproj +++ b/source/TestApp/TestApp.csproj @@ -14,6 +14,6 @@ - + diff --git a/source/WinFormsTestApp/WinFormsTestApp.csproj b/source/WinFormsTestApp/WinFormsTestApp.csproj index be8d1eac..f3557ec2 100644 --- a/source/WinFormsTestApp/WinFormsTestApp.csproj +++ b/source/WinFormsTestApp/WinFormsTestApp.csproj @@ -13,12 +13,12 @@ - - - - - - + + + + + + From d30e6e9004356cef175e2d051fd0b516916cf0c9 Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 11 Dec 2019 18:07:13 +0100 Subject: [PATCH 13/13] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f7d80300..78a55938 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 3.5.{build} +version: 4.0.{build} branches: