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: 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..806ab08b 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/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml b/source/AutomationTest/AvalonDockTest/Views/AnchorablePaneTestWindow.xaml index 181c0ce7..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 ebfdd56c..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/AvalonDock.sln b/source/AvalonDock.sln index 057efef6..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}") = "Xceed.Wpf.AvalonDock", "Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.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}") = "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\AvalonDock.Themes.Expression\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\AvalonDock.Themes.Metro\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\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}") = "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\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\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 90% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs rename to source/Components/AvalonDock.Themes.Aero/AeroColors.cs index 658a92ba..69555f23 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs +++ b/source/Components/AvalonDock.Themes.Aero/AeroColors.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -namespace Xceed.Wpf.AvalonDock.Themes +namespace AvalonDock.Themes { public static class AeroColors { diff --git a/source/Components/AvalonDock.Themes.Aero/AeroTheme.cs b/source/Components/AvalonDock.Themes.Aero/AeroTheme.cs new file mode 100644 index 00000000..c5387b85 --- /dev/null +++ b/source/Components/AvalonDock.Themes.Aero/AeroTheme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class AeroTheme : Theme + { + public override Uri GetResourceUri() + { + return new Uri( + "/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/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/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj index b21885c4..4f3f31ee 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj +++ b/source/Components/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/AvalonDock.Themes.Aero/Brushes.xaml similarity index 93% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml rename to source/Components/AvalonDock.Themes.Aero/Brushes.xaml index 04a24fe1..6611bbd8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml +++ b/source/Components/AvalonDock.Themes.Aero/Brushes.xaml @@ -1,24 +1,15 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> - - + xmlns:at="clr-namespace:AvalonDock.Themes"> CultureYouAreCodingWith in your .csproj file @@ -38,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( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )] +[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/AvalonDock.Themes.Aero/Theme.xaml similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml rename to source/Components/AvalonDock.Themes.Aero/Theme.xaml index 665ff718..f47eccd9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml +++ b/source/Components/AvalonDock.Themes.Aero/Theme.xaml @@ -1,30 +1,23 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + 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.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/Xceed.Wpf.AvalonDock.Themes.Expression.csproj b/source/Components/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/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj index 346c1c44..7c9698a4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Xceed.Wpf.AvalonDock.Themes.Expression.csproj +++ b/source/Components/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/AvalonDock.Themes.Expression/Controls/SplineBorder.cs similarity index 89% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Controls/SplineBorder.cs rename to source/Components/AvalonDock.Themes.Expression/Controls/SplineBorder.cs index a2603b3e..0bdb1253 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Controls/SplineBorder.cs +++ b/source/Components/AvalonDock.Themes.Expression/Controls/SplineBorder.cs @@ -1,24 +1,17 @@ /************************************************************************ - 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.Windows; 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/DarkBrushes.xaml b/source/Components/AvalonDock.Themes.Expression/DarkBrushes.xaml similarity index 88% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/DarkBrushes.xaml rename to source/Components/AvalonDock.Themes.Expression/DarkBrushes.xaml index 1f9fd49c..a53eb878 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/DarkBrushes.xaml +++ b/source/Components/AvalonDock.Themes.Expression/DarkBrushes.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/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/AvalonDock.Themes.Expression/ExpressionDarkTheme.cs b/source/Components/AvalonDock.Themes.Expression/ExpressionDarkTheme.cs new file mode 100644 index 00000000..9c5e134d --- /dev/null +++ b/source/Components/AvalonDock.Themes.Expression/ExpressionDarkTheme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class ExpressionDarkTheme : Theme + { + public override Uri GetResourceUri() + { + return new Uri( + "/AvalonDock.Themes.Expression;component/DarkTheme.xaml", + UriKind.Relative); + } + } +} diff --git a/source/Components/AvalonDock.Themes.Expression/ExpressionLightTheme.cs b/source/Components/AvalonDock.Themes.Expression/ExpressionLightTheme.cs new file mode 100644 index 00000000..ada3d595 --- /dev/null +++ b/source/Components/AvalonDock.Themes.Expression/ExpressionLightTheme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class ExpressionLightTheme : Theme + { + public override Uri GetResourceUri() + { + return new Uri( + "/AvalonDock.Themes.Expression;component/LightTheme.xaml", + UriKind.Relative); + } + } +} 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 88% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightBrushes.xaml rename to source/Components/AvalonDock.Themes.Expression/LightBrushes.xaml index d9cb5543..d198b3c9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/LightBrushes.xaml +++ b/source/Components/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/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.Aero/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs similarity index 59% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs index 1b5b418c..3c724777 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs +++ b/source/Components/AvalonDock.Themes.Expression/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( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )] \ No newline at end of file +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml b/source/Components/AvalonDock.Themes.Expression/Theme.xaml similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml rename to source/Components/AvalonDock.Themes.Expression/Theme.xaml index 0d14c6e1..d1539241 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Theme.xaml +++ b/source/Components/AvalonDock.Themes.Expression/Theme.xaml @@ -1,31 +1,24 @@ - + 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 + ************************************************************************--> @@ -117,7 +110,7 @@ - + - + - + @@ -388,7 +381,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 +423,16 @@ - + - + - + - + @@ -617,7 +610,7 @@ Command="{Binding Path=NewHorizontalTabGroupCommand}" Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"> - + @@ -625,7 +618,7 @@ Command="{Binding Path=NewVerticalTabGroupCommand}" Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"> - + + Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png"/> @@ -766,7 +759,7 @@ - + @@ -807,7 +800,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 +814,7 @@ - + @@ -916,7 +909,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 +965,19 @@ Value="{DynamicResource AvalonDock_Expression_BaseColor10}" /> - + - + - + - + - + @@ -1043,7 +1036,7 @@ ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}" Grid.Column="2" Panel.ZIndex="100"> - + @@ -1067,10 +1060,10 @@ - + - + @@ -1114,7 +1107,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 +1179,16 @@ - + - + - + - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/sn.snk b/source/Components/AvalonDock.Themes.Expression/sn.snk similarity index 100% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/sn.snk rename to source/Components/AvalonDock.Themes.Expression/sn.snk diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj b/source/Components/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/AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj index 7fd00f85..09772288 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj +++ b/source/Components/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 + 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/Brushes.xaml b/source/Components/AvalonDock.Themes.Metro/Brushes.xaml similarity index 71% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml rename to source/Components/AvalonDock.Themes.Metro/Brushes.xaml index a4310602..f35b2aa7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml +++ b/source/Components/AvalonDock.Themes.Metro/Brushes.xaml @@ -1,18 +1,11 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> 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/AvalonDock.Themes.Metro/MetroTheme.cs b/source/Components/AvalonDock.Themes.Metro/MetroTheme.cs new file mode 100644 index 00000000..4751dd5f --- /dev/null +++ b/source/Components/AvalonDock.Themes.Metro/MetroTheme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class MetroTheme : Theme + { + public override Uri GetResourceUri() + { + return new Uri( + "/AvalonDock.Themes.Metro;component/Theme.xaml", + UriKind.Relative); + } + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs similarity index 59% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs index d7e10097..3c724777 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs +++ b/source/Components/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( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.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/AvalonDock.Themes.Metro/Theme.xaml similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml rename to source/Components/AvalonDock.Themes.Metro/Theme.xaml index ac3a1a05..22ae9782 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml +++ b/source/Components/AvalonDock.Themes.Metro/Theme.xaml @@ -1,28 +1,21 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + 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.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/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj b/source/Components/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/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj index 99df18b6..dac79cc7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj +++ b/source/Components/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/Brushes.xaml b/source/Components/AvalonDock.Themes.VS2010/Brushes.xaml similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml rename to source/Components/AvalonDock.Themes.VS2010/Brushes.xaml index d4ce46c1..346556a8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml +++ b/source/Components/AvalonDock.Themes.VS2010/Brushes.xaml @@ -1,18 +1,11 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> 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.Metro/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs similarity index 59% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs rename to source/Components/AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs index d7e10097..3c724777 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs +++ b/source/Components/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( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.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/AvalonDock.Themes.VS2010/Theme.xaml similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml rename to source/Components/AvalonDock.Themes.VS2010/Theme.xaml index d4985082..b74f32bf 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml +++ b/source/Components/AvalonDock.Themes.VS2010/Theme.xaml @@ -1,28 +1,21 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + 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/AvalonDock.Themes.VS2010/VS2010Theme.cs b/source/Components/AvalonDock.Themes.VS2010/VS2010Theme.cs new file mode 100644 index 00000000..5457e67e --- /dev/null +++ b/source/Components/AvalonDock.Themes.VS2010/VS2010Theme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class VS2010Theme : Theme + { + public override Uri GetResourceUri() + { + return new Uri( + "/AvalonDock.Themes.VS2010;component/Theme.xaml", + UriKind.Relative); + } + } +} 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/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj b/source/Components/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/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj index 3b78f1e3..5d7bd9bc 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj +++ b/source/Components/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/AvalonDock.Themes.VS2013/BlueBrushs.xaml similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueBrushs.xaml rename to source/Components/AvalonDock.Themes.VS2013/BlueBrushs.xaml index ec01e779..854f5092 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueBrushs.xaml +++ b/source/Components/AvalonDock.Themes.VS2013/BlueBrushs.xaml @@ -1,6 +1,6 @@  diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml b/source/Components/AvalonDock.Themes.VS2013/BlueTheme.xaml similarity index 51% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml rename to source/Components/AvalonDock.Themes.VS2013/BlueTheme.xaml index 18eaea01..a8769294 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/BlueTheme.xaml +++ b/source/Components/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/AvalonDock.Themes.VS2013/DarkBrushs.xaml similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkBrushs.xaml rename to source/Components/AvalonDock.Themes.VS2013/DarkBrushs.xaml index 83cd6bd9..94331b71 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkBrushs.xaml +++ b/source/Components/AvalonDock.Themes.VS2013/DarkBrushs.xaml @@ -1,10 +1,10 @@  - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml b/source/Components/AvalonDock.Themes.VS2013/DarkTheme.xaml similarity index 51% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml rename to source/Components/AvalonDock.Themes.VS2013/DarkTheme.xaml index e24f2b98..57811622 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/DarkTheme.xaml +++ b/source/Components/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/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 98% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightBrushs.xaml rename to source/Components/AvalonDock.Themes.VS2013/LightBrushs.xaml index 4a32678d..07f7ca3b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightBrushs.xaml +++ b/source/Components/AvalonDock.Themes.VS2013/LightBrushs.xaml @@ -1,10 +1,10 @@  - + diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml b/source/Components/AvalonDock.Themes.VS2013/LightTheme.xaml similarity index 51% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml rename to source/Components/AvalonDock.Themes.VS2013/LightTheme.xaml index 5dde1b0b..a68e7c01 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/LightTheme.xaml +++ b/source/Components/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/AvalonDock.Themes.VS2013/OverlayButtons.xaml similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/OverlayButtons.xaml rename to source/Components/AvalonDock.Themes.VS2013/OverlayButtons.xaml index e59409c6..db4f0676 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/OverlayButtons.xaml +++ b/source/Components/AvalonDock.Themes.VS2013/OverlayButtons.xaml @@ -1,6 +1,6 @@  diff --git a/source/Components/AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs b/source/Components/AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..3c724777 --- /dev/null +++ b/source/Components/AvalonDock.Themes.VS2013/Properties/AssemblyInfo.cs @@ -0,0 +1,41 @@ +/************************************************************************ + 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.Runtime.InteropServices; +using System.Windows; +using System.Windows.Markup; +using System; + +// 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)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[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) + 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) +)] + + +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml rename to source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml index da0e7b90..77b8a6d2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml +++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml @@ -1,34 +1,24 @@ - - + - - + + @@ -151,7 +141,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonDefaultGlyph}}" Width="12" Height="12"> - + @@ -532,7 +522,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}" Width="13" Height="13"> - + @@ -554,7 +544,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}" Width="13" Height="13"> - + @@ -575,7 +565,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}" Width="13" Height="13"> - + @@ -1446,7 +1436,7 @@ - + @@ -1716,7 +1706,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -1738,7 +1728,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -1760,7 +1750,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -1783,7 +1773,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -2048,7 +2038,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -2072,7 +2062,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -2094,7 +2084,7 @@ Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" Width="13" Height="13"> - + @@ -2117,7 +2107,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/AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/DarkBrushs.xaml rename to source/Components/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/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/AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Menu/MenuKeys.cs rename to source/Components/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/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/AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs rename to source/Components/AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs index 280615e4..6afe1452 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/ResourceKeys.cs +++ b/source/Components/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/AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs b/source/Components/AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs new file mode 100644 index 00000000..ccc1507e --- /dev/null +++ b/source/Components/AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class Vs2013BlueTheme : Theme + { + public override Uri GetResourceUri() + { + return new Uri( + "/AvalonDock.Themes.VS2013;component/BlueTheme.xaml", + UriKind.Relative); + } + } +} diff --git a/source/Components/AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs b/source/Components/AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs new file mode 100644 index 00000000..82bbd815 --- /dev/null +++ b/source/Components/AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class Vs2013DarkTheme : Theme + { + public override Uri GetResourceUri() + { + return new Uri( + "/AvalonDock.Themes.VS2013;component/DarkTheme.xaml", + UriKind.Relative); + } + } +} diff --git a/source/Components/AvalonDock.Themes.VS2013/Vs2013LightTheme.cs b/source/Components/AvalonDock.Themes.VS2013/Vs2013LightTheme.cs new file mode 100644 index 00000000..7eb1e463 --- /dev/null +++ b/source/Components/AvalonDock.Themes.VS2013/Vs2013LightTheme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class Vs2013LightTheme : Theme + { + public override Uri GetResourceUri() + { + return new Uri( + "/AvalonDock.Themes.VS2013;component/LightTheme.xaml", + UriKind.Relative); + } + } +} 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/Xceed.Wpf.AvalonDock.csproj b/source/Components/AvalonDock/AvalonDock.csproj similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj rename to source/Components/AvalonDock/AvalonDock.csproj index 4b6c44cc..53cfe9e4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj +++ b/source/Components/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/AvalonDock/Commands/RelayCommand.cs similarity index 72% rename from source/Components/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs rename to source/Components/AvalonDock/Commands/RelayCommand.cs index 1ffd87c2..13203c4d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs +++ b/source/Components/AvalonDock/Commands/RelayCommand.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs similarity index 63% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs rename to source/Components/AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs index ccb44545..23292df6 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs +++ b/source/Components/AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/AnchorablePaneDropTarget.cs similarity index 96% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs rename to source/Components/AvalonDock/Controls/AnchorablePaneDropTarget.cs index 74291d93..00f8372c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs +++ b/source/Components/AvalonDock/Controls/AnchorablePaneDropTarget.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/AnchorablePaneTabPanel.cs similarity index 84% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs rename to source/Components/AvalonDock/Controls/AnchorablePaneTabPanel.cs index 2920a2e0..02313f63 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs +++ b/source/Components/AvalonDock/Controls/AnchorablePaneTabPanel.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/AnchorablePaneTitle.cs similarity index 91% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs rename to source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs index 37b82f0a..4808773a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs +++ b/source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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.Linq; 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/AvalonDock/Controls/AutoHideWindowManager.cs similarity index 78% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs rename to source/Components/AvalonDock/Controls/AutoHideWindowManager.cs index 51706782..cfdd4010 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs +++ b/source/Components/AvalonDock/Controls/AutoHideWindowManager.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/BindingHelper.cs similarity index 74% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs rename to source/Components/AvalonDock/Controls/BindingHelper.cs index e29d90a4..ae75a714 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs +++ b/source/Components/AvalonDock/Controls/BindingHelper.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; using System.Windows; @@ -20,7 +13,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/AvalonDock/Controls/ContextMenuEx.cs similarity index 61% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs rename to source/Components/AvalonDock/Controls/ContextMenuEx.cs index 09d041ad..e50ac844 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs +++ b/source/Components/AvalonDock/Controls/ContextMenuEx.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/DockingManagerDropTarget.cs similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs rename to source/Components/AvalonDock/Controls/DockingManagerDropTarget.cs index 164fa39a..98d8e574 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs +++ b/source/Components/AvalonDock/Controls/DockingManagerDropTarget.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/DockingManagerOverlayArea.cs similarity index 58% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs rename to source/Components/AvalonDock/Controls/DockingManagerOverlayArea.cs index 1f93fcb6..0cfc3e32 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs +++ b/source/Components/AvalonDock/Controls/DockingManagerOverlayArea.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/DocumentPaneControlOverlayArea.cs similarity index 62% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs rename to source/Components/AvalonDock/Controls/DocumentPaneControlOverlayArea.cs index dfc42f1e..4c3d43a2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs +++ b/source/Components/AvalonDock/Controls/DocumentPaneControlOverlayArea.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs similarity index 95% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs rename to source/Components/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs index c53baa62..74ab6f28 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs +++ b/source/Components/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/DocumentPaneDropTarget.cs similarity index 97% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs rename to source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs index 86f714d0..4df1b3df 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs +++ b/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs similarity index 84% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs rename to source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs index b7d4cb99..5e249d76 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs +++ b/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/DocumentPaneTabPanel.cs similarity index 86% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs rename to source/Components/AvalonDock/Controls/DocumentPaneTabPanel.cs index 07a2b5f6..f7108108 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs +++ b/source/Components/AvalonDock/Controls/DocumentPaneTabPanel.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/DragService.cs similarity index 90% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DragService.cs rename to source/Components/AvalonDock/Controls/DragService.cs index 41f7d30f..cfc0f1f9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DragService.cs +++ b/source/Components/AvalonDock/Controls/DragService.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/DropArea.cs similarity index 69% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropArea.cs rename to source/Components/AvalonDock/Controls/DropArea.cs index 714516d9..f2d3079b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropArea.cs +++ b/source/Components/AvalonDock/Controls/DropArea.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/DropDownButton.cs similarity index 89% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs rename to source/Components/AvalonDock/Controls/DropDownButton.cs index 2f87b91d..97c01fde 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs +++ b/source/Components/AvalonDock/Controls/DropDownButton.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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.Controls.Primitives; 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/AvalonDock/Controls/DropDownControlArea.cs similarity index 87% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs rename to source/Components/AvalonDock/Controls/DropDownControlArea.cs index bb6fa9e4..917009e7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs +++ b/source/Components/AvalonDock/Controls/DropDownControlArea.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/DropTarget.cs similarity index 83% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs rename to source/Components/AvalonDock/Controls/DropTarget.cs index 297fe42a..3016676b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs +++ b/source/Components/AvalonDock/Controls/DropTarget.cs @@ -1,28 +1,21 @@ -/************************************************************************************* - - 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; using System.Collections.Generic; 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/AvalonDock/Controls/DropTargetBase.cs similarity index 72% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs rename to source/Components/AvalonDock/Controls/DropTargetBase.cs index c3887a5f..0cb5934a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs +++ b/source/Components/AvalonDock/Controls/DropTargetBase.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/DropTargetType.cs similarity index 62% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs rename to source/Components/AvalonDock/Controls/DropTargetType.cs index 8d3fbd47..00ec917d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs +++ b/source/Components/AvalonDock/Controls/DropTargetType.cs @@ -1,20 +1,13 @@ -/************************************************************************************* - - 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 + ************************************************************************/ -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/AvalonDock/Controls/Extentions.cs similarity index 84% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Extentions.cs rename to source/Components/AvalonDock/Controls/Extentions.cs index e22947e2..88749db5 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Extentions.cs +++ b/source/Components/AvalonDock/Controls/Extentions.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.Collections.Generic; using System.Linq; @@ -20,7 +13,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/AvalonDock/Controls/FocusElementManager.cs similarity index 94% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs rename to source/Components/AvalonDock/Controls/FocusElementManager.cs index 3971200e..57677774 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs +++ b/source/Components/AvalonDock/Controls/FocusElementManager.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; using System.Collections.Generic; @@ -22,11 +15,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/AvalonDock/Controls/FullWeakDictionary.cs similarity index 80% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs rename to source/Components/AvalonDock/Controls/FullWeakDictionary.cs index 0218be7e..f65728a4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs +++ b/source/Components/AvalonDock/Controls/FullWeakDictionary.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/IDropTarget.cs similarity index 55% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs rename to source/Components/AvalonDock/Controls/IDropTarget.cs index 3a5b7b25..af4fed04 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs +++ b/source/Components/AvalonDock/Controls/IDropTarget.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/IOverlayWindow.cs similarity index 57% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs rename to source/Components/AvalonDock/Controls/IOverlayWindow.cs index 410c5071..6002e3cb 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs +++ b/source/Components/AvalonDock/Controls/IOverlayWindow.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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.Collections.Generic; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal interface IOverlayWindow { diff --git a/source/Components/AvalonDock/Controls/IOverlayWindowArea.cs b/source/Components/AvalonDock/Controls/IOverlayWindowArea.cs new file mode 100644 index 00000000..10e15df3 --- /dev/null +++ b/source/Components/AvalonDock/Controls/IOverlayWindowArea.cs @@ -0,0 +1,21 @@ +/************************************************************************ + 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.Windows; + +namespace AvalonDock.Controls +{ + internal interface IOverlayWindowArea + { + Rect ScreenDetectionArea + { + get; + } + } +} diff --git a/source/Components/AvalonDock/Controls/IOverlayWindowDropTarget.cs b/source/Components/AvalonDock/Controls/IOverlayWindowDropTarget.cs new file mode 100644 index 00000000..458a45ed --- /dev/null +++ b/source/Components/AvalonDock/Controls/IOverlayWindowDropTarget.cs @@ -0,0 +1,26 @@ +/************************************************************************ + 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.Windows; + +namespace AvalonDock.Controls +{ + interface IOverlayWindowDropTarget + { + Rect ScreenDetectionArea + { + get; + } + + OverlayWindowDropTargetType Type + { + get; + } + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs b/source/Components/AvalonDock/Controls/IOverlayWindowHost.cs similarity index 57% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs rename to source/Components/AvalonDock/Controls/IOverlayWindowHost.cs index 64bccb76..92c51c6a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs +++ b/source/Components/AvalonDock/Controls/IOverlayWindowHost.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/LayoutAnchorControl.cs similarity index 91% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorControl.cs index 231a5d8a..4dc37c51 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorControl.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/LayoutAnchorGroupControl.cs similarity index 85% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorGroupControl.cs index 56047f9c..3ba30994 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorGroupControl.cs @@ -1,27 +1,20 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/LayoutAnchorSideControl.cs similarity index 93% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorSideControl.cs index 58993317..ea7b375e 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorSideControl.cs @@ -1,27 +1,20 @@ -/************************************************************************************* - - 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; using System.Linq; 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/AvalonDock/Controls/LayoutAnchorableControl.cs similarity index 88% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs index 208794f5..461c0900 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs similarity index 95% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs index 7d1809a1..477888c1 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.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; using System.Collections.Generic; @@ -20,13 +13,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 +245,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/AvalonDock/Controls/LayoutAnchorableItem.cs similarity index 95% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorableItem.cs index fee08079..4e73ecc9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorableItem.cs @@ -1,27 +1,20 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/LayoutAnchorablePaneControl.cs similarity index 80% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs index e49de44e..1b545e69 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs @@ -1,112 +1,105 @@ -/************************************************************************************* - - 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 + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ - 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; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls -{ - public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer - { +namespace AvalonDock.Controls +{ + public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer + { #region Members - - private LayoutAnchorablePane _model; - + + 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; - } - + + 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; - } - } - + + 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; - - } - - + + 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; - } - + + 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 73% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs index 282f5597..e1741786 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/LayoutAnchorableTabItem.cs similarity index 92% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs rename to source/Components/AvalonDock/Controls/LayoutAnchorableTabItem.cs index 2a0b387a..375ee7a1 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorableTabItem.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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.Linq; 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/AvalonDock/Controls/LayoutAutoHideWindowControl.cs similarity index 97% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs rename to source/Components/AvalonDock/Controls/LayoutAutoHideWindowControl.cs index eb7d0434..c76c5142 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAutoHideWindowControl.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; using System.Linq; @@ -23,9 +16,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/AvalonDock/Controls/LayoutDocumentControl.cs similarity index 89% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentControl.cs index bd425f17..03059aa4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutDocumentControl.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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.ComponentModel; 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/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs similarity index 87% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs index 792b8716..f2c981c8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs @@ -1,26 +1,19 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/LayoutDocumentItem.cs similarity index 83% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentItem.cs index e3c8c34c..c0390ff7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs +++ b/source/Components/AvalonDock/Controls/LayoutDocumentItem.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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 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/AvalonDock/Controls/LayoutDocumentPaneControl.cs similarity index 81% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs index 496a4eca..293d51aa 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs @@ -1,119 +1,112 @@ -/************************************************************************************* - - 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 + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************/ - 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; +using AvalonDock.Layout; -namespace Xceed.Wpf.AvalonDock.Controls -{ - public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer - { +namespace AvalonDock.Controls +{ + public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer + { #region Members - - private List _logicalChildren = new List(); - private LayoutDocumentPane _model; - + + 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; - } - + + 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; - } - } - + + 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; - - } - - + + 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; - } - + + 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 73% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs index 9806c886..91fe7f13 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/LayoutDocumentTabItem.cs similarity index 93% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs rename to source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs index 7569355e..68f5a1c0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs +++ b/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.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; using System.Collections.Generic; @@ -20,9 +13,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/AvalonDock/Controls/LayoutFloatingWindowControl.cs similarity index 97% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs rename to source/Components/AvalonDock/Controls/LayoutFloatingWindowControl.cs index 36e3e0bc..5a5ea4dd 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutFloatingWindowControl.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; using System.ComponentModel; @@ -24,11 +17,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/AvalonDock/Controls/LayoutGridControl.cs similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs rename to source/Components/AvalonDock/Controls/LayoutGridControl.cs index a65012e9..8a2e5a08 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutGridControl.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; using System.Collections.Generic; @@ -21,10 +14,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/AvalonDock/Controls/LayoutGridResizerControl.cs similarity index 85% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs rename to source/Components/AvalonDock/Controls/LayoutGridResizerControl.cs index ff82d073..d4284967 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutGridResizerControl.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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.Controls.Primitives; 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/AvalonDock/Controls/LayoutItem.cs similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs rename to source/Components/AvalonDock/Controls/LayoutItem.cs index b10a0330..f89491a2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs +++ b/source/Components/AvalonDock/Controls/LayoutItem.cs @@ -1,30 +1,23 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/LayoutPanelControl.cs similarity index 89% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs rename to source/Components/AvalonDock/Controls/LayoutPanelControl.cs index e5795f3b..6782338f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutPanelControl.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/MenuItemEx.cs similarity index 89% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs rename to source/Components/AvalonDock/Controls/MenuItemEx.cs index 97e9dcaa..a37748c1 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs +++ b/source/Components/AvalonDock/Controls/MenuItemEx.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/NavigatorWindow.cs similarity index 96% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs rename to source/Components/AvalonDock/Controls/NavigatorWindow.cs index d2e371a5..37ccfdb0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs +++ b/source/Components/AvalonDock/Controls/NavigatorWindow.cs @@ -1,27 +1,20 @@ -/************************************************************************************* - - 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.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/AvalonDock/Controls/OverlayArea.cs similarity index 63% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs rename to source/Components/AvalonDock/Controls/OverlayArea.cs index 6856ccfd..76314e6c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs +++ b/source/Components/AvalonDock/Controls/OverlayArea.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/OverlayWindow.cs similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs rename to source/Components/AvalonDock/Controls/OverlayWindow.cs index 430ac345..71140bde 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs +++ b/source/Components/AvalonDock/Controls/OverlayWindow.cs @@ -1,28 +1,21 @@ -/************************************************************************************* - - 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.Collections.Generic; using System.Linq; 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/AvalonDock/Controls/OverlayWindowDropTarget.cs similarity index 69% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs rename to source/Components/AvalonDock/Controls/OverlayWindowDropTarget.cs index d37eb456..2e35f9d6 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs +++ b/source/Components/AvalonDock/Controls/OverlayWindowDropTarget.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/OverlayWindowDropTargetType.cs similarity index 56% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs rename to source/Components/AvalonDock/Controls/OverlayWindowDropTargetType.cs index 3f46ded1..bf634fcf 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs +++ b/source/Components/AvalonDock/Controls/OverlayWindowDropTargetType.cs @@ -1,20 +1,13 @@ -/************************************************************************************* - - 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 + ************************************************************************/ -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/AvalonDock/Controls/ReentrantFlag.cs similarity index 66% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs rename to source/Components/AvalonDock/Controls/ReentrantFlag.cs index 5b5930da..aaec184c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs +++ b/source/Components/AvalonDock/Controls/ReentrantFlag.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -namespace Xceed.Wpf.AvalonDock.Controls +namespace AvalonDock.Controls { internal class ReentrantFlag { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.cs similarity index 91% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.cs index c3d2714f..79e4e140 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Debug.cs similarity index 96% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/Debug.cs index 9a413180..ef26c33a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/Debug.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs b/source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs similarity index 93% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs index da1aeb2b..18e04290 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs @@ -1,19 +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 + ************************************************************************/ namespace Standard { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs b/source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.cs similarity index 89% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.cs index 5bb913ab..b183d8f2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.cs similarity index 97% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.cs index 6d6fb7b0..624a09cc 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs b/source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.cs similarity index 91% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.cs index 4bf9c455..b80d3617 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs b/source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.cs similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.cs index d89cc7a6..cc2afe65 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.cs similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.cs index 11f45705..1f8a06d2 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs b/source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.cs similarity index 96% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.cs index d1cc2806..5384a921 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Utilities.cs similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/Utilities.cs index 2ae308d2..152bf979 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/Utilities.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Verify.cs similarity index 96% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs rename to source/Components/AvalonDock/Controls/Shell/Standard/Verify.cs index 153e404d..e7755860 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs +++ b/source/Components/AvalonDock/Controls/Shell/Standard/Verify.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs b/source/Components/AvalonDock/Controls/Shell/SystemCommands.cs similarity index 88% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs rename to source/Components/AvalonDock/Controls/Shell/SystemCommands.cs index 7d1d58d3..14056e38 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs +++ b/source/Components/AvalonDock/Controls/Shell/SystemCommands.cs @@ -1,19 +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 + ************************************************************************/ namespace Microsoft.Windows.Shell { diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs b/source/Components/AvalonDock/Controls/Shell/SystemParameters2.cs similarity index 97% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs rename to source/Components/AvalonDock/Controls/Shell/SystemParameters2.cs index 2ce0b605..cb63c437 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs +++ b/source/Components/AvalonDock/Controls/Shell/SystemParameters2.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs b/source/Components/AvalonDock/Controls/Shell/WindowChrome.cs similarity index 95% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs rename to source/Components/AvalonDock/Controls/Shell/WindowChrome.cs index aca26c01..18d66c7a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs +++ b/source/Components/AvalonDock/Controls/Shell/WindowChrome.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs b/source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.cs similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs rename to source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.cs index a22412ce..0a10e21b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs +++ b/source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.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 + ************************************************************************/ /**************************************************************************\ Copyright Microsoft Corporation. All Rights Reserved. diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs b/source/Components/AvalonDock/Controls/TransformExtentions.cs similarity index 88% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs rename to source/Components/AvalonDock/Controls/TransformExtentions.cs index b88663b0..2683f455 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs +++ b/source/Components/AvalonDock/Controls/TransformExtentions.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/WeakDictionary.cs similarity index 78% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs rename to source/Components/AvalonDock/Controls/WeakDictionary.cs index 64b88d8d..d3fefef4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs +++ b/source/Components/AvalonDock/Controls/WeakDictionary.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Controls/WindowActivateEventArgs.cs similarity index 52% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs rename to source/Components/AvalonDock/Controls/WindowActivateEventArgs.cs index 804294b2..c0d831e3 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs +++ b/source/Components/AvalonDock/Controls/WindowActivateEventArgs.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Controls/WindowHookHandler.cs similarity index 81% rename from source/Components/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs rename to source/Components/AvalonDock/Controls/WindowHookHandler.cs index 544bc2fb..a6aa1bcf 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs +++ b/source/Components/AvalonDock/Controls/WindowHookHandler.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs similarity index 69% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs rename to source/Components/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs index 45c5d32b..ac091025 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs +++ b/source/Components/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/AnchorSideToAngleConverter.cs similarity index 61% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs rename to source/Components/AvalonDock/Converters/AnchorSideToAngleConverter.cs index e63779e2..a2766dbd 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs +++ b/source/Components/AvalonDock/Converters/AnchorSideToAngleConverter.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/AnchorSideToOrientationConverter.cs similarity index 63% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs rename to source/Components/AvalonDock/Converters/AnchorSideToOrientationConverter.cs index 1c132613..71336744 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs +++ b/source/Components/AvalonDock/Converters/AnchorSideToOrientationConverter.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs similarity index 67% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs rename to source/Components/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs index 6848e05f..f30967e0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs +++ b/source/Components/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.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; using System.Globalization; @@ -20,7 +13,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/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs similarity index 68% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs rename to source/Components/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs index b0cb4111..5b781657 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs +++ b/source/Components/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/BoolToVisibilityConverter.cs similarity index 84% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs rename to source/Components/AvalonDock/Converters/BoolToVisibilityConverter.cs index 00ae1a27..3a79bba9 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs +++ b/source/Components/AvalonDock/Converters/BoolToVisibilityConverter.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs similarity index 67% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs rename to source/Components/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs index 4b187424..5ed32b1a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs +++ b/source/Components/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs similarity index 83% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs rename to source/Components/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs index b0ee5b74..1991355f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs +++ b/source/Components/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs similarity index 66% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs rename to source/Components/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs index 5666dc28..c02077e7 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs +++ b/source/Components/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/NullToDoNothingConverter.cs similarity index 58% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs rename to source/Components/AvalonDock/Converters/NullToDoNothingConverter.cs index ae43fde0..e5005dcb 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs +++ b/source/Components/AvalonDock/Converters/NullToDoNothingConverter.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs similarity index 63% rename from source/Components/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs rename to source/Components/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs index 7887e594..e7b4f193 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs +++ b/source/Components/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; using System.Windows.Data; 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/AvalonDock/DockingManager.cs similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs rename to source/Components/AvalonDock/DockingManager.cs index 3fc71bd2..cf6155e8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs +++ b/source/Components/AvalonDock/DockingManager.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; using System.Collections.Generic; @@ -22,17 +15,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/AvalonDock/DocumentClosedEventArgs.cs b/source/Components/AvalonDock/DocumentClosedEventArgs.cs new file mode 100644 index 00000000..1278d817 --- /dev/null +++ b/source/Components/AvalonDock/DocumentClosedEventArgs.cs @@ -0,0 +1,28 @@ +/************************************************************************ + 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 AvalonDock.Layout; + +namespace AvalonDock +{ + public class DocumentClosedEventArgs : EventArgs + { + public DocumentClosedEventArgs(LayoutDocument document) + { + Document = document; + } + + public LayoutDocument Document + { + get; + private set; + } + } +} diff --git a/source/Components/AvalonDock/DocumentClosingEventArgs.cs b/source/Components/AvalonDock/DocumentClosingEventArgs.cs new file mode 100644 index 00000000..85751edf --- /dev/null +++ b/source/Components/AvalonDock/DocumentClosingEventArgs.cs @@ -0,0 +1,28 @@ +/************************************************************************ + 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.ComponentModel; +using AvalonDock.Layout; + +namespace AvalonDock +{ + public class DocumentClosingEventArgs : CancelEventArgs + { + public DocumentClosingEventArgs(LayoutDocument document) + { + Document = document; + } + + public LayoutDocument Document + { + get; + private set; + } + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Extentions.cs b/source/Components/AvalonDock/Extentions.cs similarity index 67% rename from source/Components/Xceed.Wpf.AvalonDock/Extentions.cs rename to source/Components/AvalonDock/Extentions.cs index 4950dce2..4b97a4f6 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Extentions.cs +++ b/source/Components/AvalonDock/Extentions.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/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/AvalonDock/Layout/AnchorSide.cs b/source/Components/AvalonDock/Layout/AnchorSide.cs new file mode 100644 index 00000000..86b74e47 --- /dev/null +++ b/source/Components/AvalonDock/Layout/AnchorSide.cs @@ -0,0 +1,19 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + public enum AnchorSide + { + Left, + Top, + Right, + Bottom + } +} diff --git a/source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs b/source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs new file mode 100644 index 00000000..fa0e2142 --- /dev/null +++ b/source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Layout +{ + [Flags] + public enum AnchorableShowStrategy : byte + { + Most = 0x0001, + Left = 0x0002, + Right = 0x0004, + Top = 0x0010, + Bottom = 0x0020, + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs b/source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs similarity index 60% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs rename to source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs index 6f237b56..a7ffbae4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs +++ b/source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Layout/Extentions.cs similarity index 91% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/Extentions.cs rename to source/Components/AvalonDock/Layout/Extentions.cs index 12810b46..6eaad713 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/Extentions.cs +++ b/source/Components/AvalonDock/Layout/Extentions.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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.Collections.Generic; using System.Diagnostics; using System.Runtime.InteropServices; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public static class Extensions { diff --git a/source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs b/source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs new file mode 100644 index 00000000..3ea48a92 --- /dev/null +++ b/source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs @@ -0,0 +1,18 @@ +/************************************************************************ + 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.Windows; + +namespace AvalonDock.Layout +{ + public interface IAdjustableSizeLayout + { + void AdjustFixedChildrenPanelSizes(Size? parentSize = null); + } +} diff --git a/source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs b/source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs new file mode 100644 index 00000000..7400e73b --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs @@ -0,0 +1,15 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + public interface ILayoutAnchorablePane : ILayoutPanelElement, ILayoutPane + { + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs b/source/Components/AvalonDock/Layout/ILayoutContainer.cs similarity index 55% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs rename to source/Components/AvalonDock/Layout/ILayoutContainer.cs index c5515ede..93e0d50b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs +++ b/source/Components/AvalonDock/Layout/ILayoutContainer.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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.Collections.Generic; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutContainer : ILayoutElement { diff --git a/source/Components/AvalonDock/Layout/ILayoutContentSelector.cs b/source/Components/AvalonDock/Layout/ILayoutContentSelector.cs new file mode 100644 index 00000000..c21ac7c4 --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutContentSelector.cs @@ -0,0 +1,34 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + public interface ILayoutContentSelector + { + #region Properties + + int SelectedContentIndex + { + get; set; + } + + LayoutContent SelectedContent + { + get; + } + + #endregion + + #region Methods + + int IndexOf(LayoutContent content); + + #endregion + } +} diff --git a/source/Components/AvalonDock/Layout/ILayoutControl.cs b/source/Components/AvalonDock/Layout/ILayoutControl.cs new file mode 100644 index 00000000..351eeed4 --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutControl.cs @@ -0,0 +1,19 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + public interface ILayoutControl + { + ILayoutElement Model + { + get; + } + } +} diff --git a/source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs b/source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs new file mode 100644 index 00000000..661cd387 --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs @@ -0,0 +1,15 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + public interface ILayoutDocumentPane : ILayoutPanelElement, ILayoutPane + { + } +} diff --git a/source/Components/AvalonDock/Layout/ILayoutElement.cs b/source/Components/AvalonDock/Layout/ILayoutElement.cs new file mode 100644 index 00000000..98c9ad47 --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutElement.cs @@ -0,0 +1,25 @@ +/************************************************************************ + 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.ComponentModel; + +namespace AvalonDock.Layout +{ + public interface ILayoutElement : INotifyPropertyChanged, INotifyPropertyChanging + { + ILayoutContainer Parent + { + get; + } + ILayoutRoot Root + { + get; + } + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs b/source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs similarity index 99% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs rename to source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs index 3145ca64..a5b5a3dd 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs +++ b/source/Components/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/AvalonDock/Layout/ILayoutElementWithVisibility.cs b/source/Components/AvalonDock/Layout/ILayoutElementWithVisibility.cs new file mode 100644 index 00000000..244fbd5f --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutElementWithVisibility.cs @@ -0,0 +1,16 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + public interface ILayoutElementWithVisibility + { + void ComputeVisibility(); + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs b/source/Components/AvalonDock/Layout/ILayoutGroup.cs similarity index 52% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs rename to source/Components/AvalonDock/Layout/ILayoutGroup.cs index 529386bb..3d9d69c5 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs +++ b/source/Components/AvalonDock/Layout/ILayoutGroup.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { public interface ILayoutGroup : ILayoutContainer { diff --git a/source/Components/AvalonDock/Layout/ILayoutOrientableElement.cs b/source/Components/AvalonDock/Layout/ILayoutOrientableElement.cs new file mode 100644 index 00000000..32d9238d --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutOrientableElement.cs @@ -0,0 +1,21 @@ +/************************************************************************ + 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.Windows.Controls; + +namespace AvalonDock.Layout +{ + public interface ILayoutOrientableGroup : ILayoutGroup + { + Orientation Orientation + { + get; set; + } + } +} diff --git a/source/Components/AvalonDock/Layout/ILayoutPane.cs b/source/Components/AvalonDock/Layout/ILayoutPane.cs new file mode 100644 index 00000000..1917ae2b --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutPane.cs @@ -0,0 +1,18 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + public interface ILayoutPane : ILayoutContainer, ILayoutElementWithVisibility + { + void MoveChild(int oldIndex, int newIndex); + + void RemoveChildAt(int childIndex); + } +} diff --git a/source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs b/source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs new file mode 100644 index 00000000..45dcd343 --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs @@ -0,0 +1,19 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + interface ILayoutPaneSerializable + { + string Id + { + get; set; + } + } +} diff --git a/source/Components/AvalonDock/Layout/ILayoutPanelElement.cs b/source/Components/AvalonDock/Layout/ILayoutPanelElement.cs new file mode 100644 index 00000000..9d5c98f5 --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutPanelElement.cs @@ -0,0 +1,19 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + public interface ILayoutPanelElement : ILayoutElement + { + bool IsVisible + { + get; + } + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs b/source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs similarity index 74% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs rename to source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs index 0d5744a4..d810d269 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs +++ b/source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -namespace Xceed.Wpf.AvalonDock.Layout +namespace AvalonDock.Layout { internal interface ILayoutPositionableElement : ILayoutElement, ILayoutElementForFloatingWindow { diff --git a/source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs b/source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs new file mode 100644 index 00000000..0d30ed6e --- /dev/null +++ b/source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs @@ -0,0 +1,24 @@ +/************************************************************************ + 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 + ************************************************************************/ + +namespace AvalonDock.Layout +{ + interface ILayoutPreviousContainer + { + ILayoutContainer PreviousContainer + { + get; set; + } + + string PreviousContainerId + { + get; set; + } + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs b/source/Components/AvalonDock/Layout/ILayoutRoot.cs similarity index 61% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs rename to source/Components/AvalonDock/Layout/ILayoutRoot.cs index c8e1269c..29d1980a 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs +++ b/source/Components/AvalonDock/Layout/ILayoutRoot.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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.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/AvalonDock/Layout/ILayoutUpdateStrategy.cs similarity index 59% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs rename to source/Components/AvalonDock/Layout/ILayoutUpdateStrategy.cs index 7d97653e..a4b06082 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs +++ b/source/Components/AvalonDock/Layout/ILayoutUpdateStrategy.cs @@ -1,20 +1,13 @@ -/************************************************************************************* - - 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 + ************************************************************************/ -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/AvalonDock/Layout/LayoutAnchorGroup.cs similarity index 82% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorGroup.cs index 4d2c7ea4..fb2e5d1b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs +++ b/source/Components/AvalonDock/Layout/LayoutAnchorGroup.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Layout/LayoutAnchorSide.cs similarity index 74% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorSide.cs index 6dcbdb35..3f133921 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs +++ b/source/Components/AvalonDock/Layout/LayoutAnchorSide.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Layout/LayoutAnchorable.cs similarity index 97% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorable.cs index b2c9b743..b48f7e88 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs +++ b/source/Components/AvalonDock/Layout/LayoutAnchorable.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; using System.Linq; @@ -22,7 +15,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/AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs similarity index 91% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs index 50be02e3..a3157564 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs +++ b/source/Components/AvalonDock/Layout/LayoutAnchorableFloatingWindow.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; using System.Collections.Generic; @@ -22,7 +15,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/AvalonDock/Layout/LayoutAnchorablePane.cs similarity index 93% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs index 61e9b96e..fb3c5b05 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs +++ b/source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; using System.Linq; 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/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs similarity index 86% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs rename to source/Components/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs index 66ba06bd..395a1bb3 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs +++ b/source/Components/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; using System.Linq; 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/AvalonDock/Layout/LayoutContent.cs similarity index 97% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs rename to source/Components/AvalonDock/Layout/LayoutContent.cs index a440818b..3b9f9d71 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs +++ b/source/Components/AvalonDock/Layout/LayoutContent.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; using System.Linq; @@ -22,9 +15,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/AvalonDock/Layout/LayoutDocument.cs similarity index 86% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs rename to source/Components/AvalonDock/Layout/LayoutDocument.cs index 366211c3..a987511b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs +++ b/source/Components/AvalonDock/Layout/LayoutDocument.cs @@ -1,24 +1,16 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Layout/LayoutDocumentFloatingWindow.cs similarity index 87% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs rename to source/Components/AvalonDock/Layout/LayoutDocumentFloatingWindow.cs index 52717f4b..a85ac2d6 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs +++ b/source/Components/AvalonDock/Layout/LayoutDocumentFloatingWindow.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; using System.Collections.Generic; @@ -21,7 +14,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/AvalonDock/Layout/LayoutDocumentPane.cs similarity index 91% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs rename to source/Components/AvalonDock/Layout/LayoutDocumentPane.cs index e8b6c09e..838597cd 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs +++ b/source/Components/AvalonDock/Layout/LayoutDocumentPane.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; using System.Collections.Generic; 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/AvalonDock/Layout/LayoutDocumentPaneGroup.cs similarity index 79% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs rename to source/Components/AvalonDock/Layout/LayoutDocumentPaneGroup.cs index 57dbf721..24396bcf 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs +++ b/source/Components/AvalonDock/Layout/LayoutDocumentPaneGroup.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Layout/LayoutElement.cs similarity index 87% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs rename to source/Components/AvalonDock/Layout/LayoutElement.cs index 2569b7c4..315a2db8 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs +++ b/source/Components/AvalonDock/Layout/LayoutElement.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; using System.Windows; 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/AvalonDock/Layout/LayoutElementEventArgs.cs similarity index 51% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs rename to source/Components/AvalonDock/Layout/LayoutElementEventArgs.cs index ec726867..f10e811d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs +++ b/source/Components/AvalonDock/Layout/LayoutElementEventArgs.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -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/AvalonDock/Layout/LayoutFloatingWindow.cs similarity index 74% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs rename to source/Components/AvalonDock/Layout/LayoutFloatingWindow.cs index 6f45945e..073d7d06 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs +++ b/source/Components/AvalonDock/Layout/LayoutFloatingWindow.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; using System.Collections.Generic; @@ -20,7 +13,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/AvalonDock/Layout/LayoutGroup.cs similarity index 93% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs rename to source/Components/AvalonDock/Layout/LayoutGroup.cs index cdc7717f..ca600071 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs +++ b/source/Components/AvalonDock/Layout/LayoutGroup.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; using System.Collections.Generic; @@ -20,7 +13,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/AvalonDock/Layout/LayoutGroupBase.cs similarity index 76% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs rename to source/Components/AvalonDock/Layout/LayoutGroupBase.cs index 245c6966..a9230c1c 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs +++ b/source/Components/AvalonDock/Layout/LayoutGroupBase.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Layout/LayoutPanel.cs similarity index 79% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs rename to source/Components/AvalonDock/Layout/LayoutPanel.cs index 045b3c85..06af9a9d 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs +++ b/source/Components/AvalonDock/Layout/LayoutPanel.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; using System.Linq; 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/AvalonDock/Layout/LayoutPositionableGroup.cs similarity index 96% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs rename to source/Components/AvalonDock/Layout/LayoutPositionableGroup.cs index 133f624b..9d84e21f 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs +++ b/source/Components/AvalonDock/Layout/LayoutPositionableGroup.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; using System.Collections.Generic; @@ -21,7 +14,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/AvalonDock/Layout/LayoutRoot.cs similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs rename to source/Components/AvalonDock/Layout/LayoutRoot.cs index df459687..baceeafa 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs +++ b/source/Components/AvalonDock/Layout/LayoutRoot.cs @@ -1,33 +1,23 @@ -/************************************************************************************* - - 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; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Windows; using System.Collections.ObjectModel; using System.Windows.Markup; using System.Xml.Serialization; -using Standard; using System.Xml; 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/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs similarity index 57% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs rename to source/Components/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs index ea2bc5c9..d4b33861 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs +++ b/source/Components/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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.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/AvalonDock/Layout/Serialization/LayoutSerializer.cs similarity index 89% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs rename to source/Components/AvalonDock/Layout/Serialization/LayoutSerializer.cs index b33eb258..0f118cbb 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs +++ b/source/Components/AvalonDock/Layout/Serialization/LayoutSerializer.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs similarity index 82% rename from source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs rename to source/Components/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs index e0cfebed..56226521 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs +++ b/source/Components/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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.Xml.Serialization; using System.IO; -namespace Xceed.Wpf.AvalonDock.Layout.Serialization +namespace AvalonDock.Layout.Serialization { public class XmlLayoutSerializer : LayoutSerializer { diff --git a/source/Components/AvalonDock/LayoutEventArgs.cs b/source/Components/AvalonDock/LayoutEventArgs.cs new file mode 100644 index 00000000..f3f0d6b9 --- /dev/null +++ b/source/Components/AvalonDock/LayoutEventArgs.cs @@ -0,0 +1,28 @@ +/************************************************************************ + 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 AvalonDock.Layout; + +namespace AvalonDock +{ + class LayoutEventArgs : EventArgs + { + public LayoutEventArgs(LayoutRoot layoutRoot) + { + LayoutRoot = layoutRoot; + } + + public LayoutRoot LayoutRoot + { + get; + private set; + } + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs b/source/Components/AvalonDock/MathHelper.cs similarity index 59% rename from source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs rename to source/Components/AvalonDock/MathHelper.cs index 792c6b43..aa867861 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/MathHelper.cs +++ b/source/Components/AvalonDock/MathHelper.cs @@ -1,22 +1,15 @@ -/************************************************************************************* - - 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; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { internal static class MathHelper { diff --git a/source/Components/AvalonDock/Properties/AssemblyInfo.cs b/source/Components/AvalonDock/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..11d67b6e --- /dev/null +++ b/source/Components/AvalonDock/Properties/AssemblyInfo.cs @@ -0,0 +1,47 @@ +/************************************************************************ + 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.Runtime.InteropServices; +using System.Windows; +using System.Windows.Markup; +using System; + +// 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)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[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) + 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) +)] + +[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")] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Layout")] +[assembly: XmlnsDefinition("https://github.com/Dirkster99/AvalonDock", "AvalonDock.Themes")] + + diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs b/source/Components/AvalonDock/Properties/Resources.Designer.cs similarity index 98% rename from source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs rename to source/Components/AvalonDock/Properties/Resources.Designer.cs index 3ffcd06e..2fe6c5de 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs +++ b/source/Components/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/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 60% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs rename to source/Components/AvalonDock/Themes/DictionaryTheme.cs index fd5cd3f4..9994b5bf 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs +++ b/source/Components/AvalonDock/Themes/DictionaryTheme.cs @@ -1,23 +1,16 @@ -/************************************************************************************* - - 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; 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/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/AvalonDock/Themes/GenericTheme.cs b/source/Components/AvalonDock/Themes/GenericTheme.cs new file mode 100644 index 00000000..60f550ab --- /dev/null +++ b/source/Components/AvalonDock/Themes/GenericTheme.cs @@ -0,0 +1,21 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public class GenericTheme : Theme + { + 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/AvalonDock/Themes/Theme.cs b/source/Components/AvalonDock/Themes/Theme.cs new file mode 100644 index 00000000..f2e755bc --- /dev/null +++ b/source/Components/AvalonDock/Themes/Theme.cs @@ -0,0 +1,23 @@ +/************************************************************************ + 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; + +namespace AvalonDock.Themes +{ + public abstract class Theme : DependencyObject + { + public Theme() + { + } + + public abstract Uri GetResourceUri(); + } +} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml b/source/Components/AvalonDock/Themes/generic.xaml similarity index 95% rename from source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml rename to source/Components/AvalonDock/Themes/generic.xaml index a747cfe8..4c988d24 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/generic.xaml +++ b/source/Components/AvalonDock/Themes/generic.xaml @@ -1,27 +1,20 @@ - + License (Ms-PL) as published at https://opensource.org/licenses/MS-PL + ************************************************************************--> + 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 +76,7 @@ - + @@ -379,7 +372,7 @@ DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"> - + @@ -392,7 +385,7 @@ Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"> - + @@ -405,7 +398,7 @@ Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"> - + @@ -494,25 +487,25 @@ @@ -533,41 +526,41 @@ - - - - - @@ -590,41 +583,41 @@ - - - - - @@ -875,7 +868,7 @@ Visibility="Hidden" Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"> - + @@ -1041,7 +1034,7 @@ CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}" Grid.Column="2"> - + @@ -1053,7 +1046,7 @@ CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}" Grid.Column="2"> - + @@ -1064,7 +1057,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 +1142,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 +1154,7 @@ CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}" Grid.Column="2"> - + @@ -1173,7 +1166,7 @@ CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}" Grid.Column="2"> - + @@ -1185,7 +1178,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/AvalonDock/Win32Helper.cs similarity index 97% rename from source/Components/Xceed.Wpf.AvalonDock/Win32Helper.cs rename to source/Components/AvalonDock/Win32Helper.cs index ae3b8ca0..c3e778da 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Win32Helper.cs +++ b/source/Components/AvalonDock/Win32Helper.cs @@ -1,24 +1,17 @@ -/************************************************************************************* - - 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; 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/AvalonDock/WindowHelper.cs similarity index 78% rename from source/Components/Xceed.Wpf.AvalonDock/WindowHelper.cs rename to source/Components/AvalonDock/WindowHelper.cs index 2d9cde0a..75fd2c76 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/WindowHelper.cs +++ b/source/Components/AvalonDock/WindowHelper.cs @@ -1,25 +1,18 @@ -/************************************************************************************* - - 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; using System.Windows.Media; using System.Windows; using System.Windows.Interop; -namespace Xceed.Wpf.AvalonDock +namespace AvalonDock { static class WindowHelper { 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/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs deleted file mode 100644 index 17408635..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************************* - - 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; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class AeroTheme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.Aero;component/Theme.xaml", - UriKind.Relative); - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs deleted file mode 100644 index 255b8493..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionDarkTheme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************ - - 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 - - **********************************************************************/ - -using System; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class ExpressionDarkTheme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.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 deleted file mode 100644 index 024b87d1..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/ExpressionLightTheme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************ - - 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 - - **********************************************************************/ - -using System; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class ExpressionLightTheme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.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 deleted file mode 100644 index 065754a0..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -/************************************************************************ - - 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 - - **********************************************************************/ - -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; -using System.Windows.Markup; -using System; - -// 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 )] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[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) - 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) -)] - - -[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )] diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs deleted file mode 100644 index 95e47d26..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************************* - - 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; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class MetroTheme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.Metro;component/Theme.xaml", - UriKind.Relative); - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs deleted file mode 100644 index 64226d40..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************************* - - 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; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class VS2010Theme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Theme.xaml", - UriKind.Relative); - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs deleted file mode 100644 index a9892eb7..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013BlueTheme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************ - - 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 - - **********************************************************************/ - -using System; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class Vs2013BlueTheme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.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 deleted file mode 100644 index 22d2788c..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013DarkTheme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************ - - 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 - - **********************************************************************/ - -using System; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class Vs2013DarkTheme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.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 deleted file mode 100644 index 5a7f3c4b..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Vs2013LightTheme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************ - - 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 - - **********************************************************************/ - -using System; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class Vs2013LightTheme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( - "/Xceed.Wpf.AvalonDock.Themes.VS2013;component/LightTheme.xaml", - UriKind.Relative); - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs deleted file mode 100644 index 0c2126d7..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************************************* - - Extended WPF Toolkit - - Copyright (C) 2007-2013 Xceed Software Inc. - - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license - - For more features, controls, and fast professional support, - pick up the Plus Edition at http://xceed.com/wpf_toolkit - - Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids - - ***********************************************************************************/ - -using System.Windows; - -namespace Xceed.Wpf.AvalonDock.Controls -{ - internal interface IOverlayWindowArea - { - Rect ScreenDetectionArea - { - get; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs deleted file mode 100644 index f3c0b778..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs +++ /dev/null @@ -1,33 +0,0 @@ -/************************************************************************************* - - Extended WPF Toolkit - - Copyright (C) 2007-2013 Xceed Software Inc. - - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license - - For more features, controls, and fast professional support, - pick up the Plus Edition at http://xceed.com/wpf_toolkit - - Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids - - ***********************************************************************************/ - -using System.Windows; - -namespace Xceed.Wpf.AvalonDock.Controls -{ - interface IOverlayWindowDropTarget - { - Rect ScreenDetectionArea - { - get; - } - - OverlayWindowDropTargetType Type - { - get; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs deleted file mode 100644 index d2f486c1..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************************************************* - - 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 Xceed.Wpf.AvalonDock.Layout; - -namespace Xceed.Wpf.AvalonDock -{ - public class DocumentClosedEventArgs : EventArgs - { - public DocumentClosedEventArgs(LayoutDocument document) - { - Document = document; - } - - public LayoutDocument Document - { - get; - private set; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs deleted file mode 100644 index 97fcfec8..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************************************************* - - 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.ComponentModel; -using Xceed.Wpf.AvalonDock.Layout; - -namespace Xceed.Wpf.AvalonDock -{ - public class DocumentClosingEventArgs : CancelEventArgs - { - public DocumentClosingEventArgs(LayoutDocument document) - { - Document = document; - } - - public LayoutDocument Document - { - get; - private set; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs deleted file mode 100644 index 20882e00..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs +++ /dev/null @@ -1,26 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public enum AnchorSide - { - Left, - Top, - Right, - Bottom - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs deleted file mode 100644 index 80cd669b..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************************* - - 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; - -namespace Xceed.Wpf.AvalonDock.Layout -{ - [Flags] - public enum AnchorableShowStrategy : byte - { - Most = 0x0001, - Left = 0x0002, - Right = 0x0004, - Top = 0x0010, - Bottom = 0x0020, - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs deleted file mode 100644 index 05eeae5b..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/IAdjustableSizeLayout.cs +++ /dev/null @@ -1,25 +0,0 @@ -/************************************************************************************* - - Extended WPF Toolkit - - Copyright (C) 2007-2013 Xceed Software Inc. - - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license - - For more features, controls, and fast professional support, - pick up the Plus Edition at http://xceed.com/wpf_toolkit - - Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids - - ***********************************************************************************/ - -using System.Windows; - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface IAdjustableSizeLayout - { - void AdjustFixedChildrenPanelSizes(Size? parentSize = null); - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs deleted file mode 100644 index 63cae180..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs +++ /dev/null @@ -1,23 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface ILayoutAnchorablePane : ILayoutPanelElement, ILayoutPane - { - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs deleted file mode 100644 index 1f558271..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs +++ /dev/null @@ -1,41 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface ILayoutContentSelector - { - #region Properties - - int SelectedContentIndex - { - get; set; - } - - LayoutContent SelectedContent - { - get; - } - - #endregion - - #region Methods - - int IndexOf(LayoutContent content); - - #endregion - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs deleted file mode 100644 index da048041..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs +++ /dev/null @@ -1,26 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface ILayoutControl - { - ILayoutElement Model - { - get; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs deleted file mode 100644 index 76cc264e..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs +++ /dev/null @@ -1,22 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - -namespace Xceed.Wpf.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 deleted file mode 100644 index a99fd6a3..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs +++ /dev/null @@ -1,32 +0,0 @@ -/************************************************************************************* - - 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.ComponentModel; - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface ILayoutElement : INotifyPropertyChanged, INotifyPropertyChanging - { - ILayoutContainer Parent - { - get; - } - ILayoutRoot Root - { - get; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs deleted file mode 100644 index ac03a42c..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs +++ /dev/null @@ -1,23 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface ILayoutElementWithVisibility - { - void ComputeVisibility(); - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs deleted file mode 100644 index 0a34f24c..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************************************* - - Extended WPF Toolkit - - Copyright (C) 2007-2013 Xceed Software Inc. - - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license - - For more features, controls, and fast professional support, - pick up the Plus Edition at http://xceed.com/wpf_toolkit - - Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids - - ***********************************************************************************/ - -using System.Windows.Controls; - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface ILayoutOrientableGroup : ILayoutGroup - { - Orientation Orientation - { - get; set; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs deleted file mode 100644 index 5532705f..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs +++ /dev/null @@ -1,25 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface ILayoutPane : ILayoutContainer, ILayoutElementWithVisibility - { - void MoveChild(int oldIndex, int newIndex); - - void RemoveChildAt(int childIndex); - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs deleted file mode 100644 index 7c013cde..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs +++ /dev/null @@ -1,27 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - - -namespace Xceed.Wpf.AvalonDock.Layout -{ - interface ILayoutPaneSerializable - { - string Id - { - get; set; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs deleted file mode 100644 index 9b3f2ce3..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs +++ /dev/null @@ -1,27 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - - -namespace Xceed.Wpf.AvalonDock.Layout -{ - public interface ILayoutPanelElement : ILayoutElement - { - bool IsVisible - { - get; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs deleted file mode 100644 index 2b99da5c..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs +++ /dev/null @@ -1,31 +0,0 @@ -/************************************************************************************* - - 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 - - ***********************************************************************************/ - -namespace Xceed.Wpf.AvalonDock.Layout -{ - interface ILayoutPreviousContainer - { - ILayoutContainer PreviousContainer - { - get; set; - } - - string PreviousContainerId - { - get; set; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs b/source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs deleted file mode 100644 index 04679358..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************************************************* - - 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 Xceed.Wpf.AvalonDock.Layout; - -namespace Xceed.Wpf.AvalonDock -{ - class LayoutEventArgs : EventArgs - { - public LayoutEventArgs(LayoutRoot layoutRoot) - { - LayoutRoot = layoutRoot; - } - - public LayoutRoot LayoutRoot - { - get; - private set; - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs deleted file mode 100644 index f2686a21..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -/************************************************************************************* - - 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.Reflection; -using System.Runtime.InteropServices; -using System.Windows; -using System.Windows.Markup; -using System; - -// 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 )] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[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) - 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) -)] - -[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" )] - - diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs b/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs deleted file mode 100644 index 8ee75811..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************************************* - - 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; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public class GenericTheme : Theme - { - public override Uri GetResourceUri() - { - return new Uri( "/Xceed.Wpf.AvalonDock;component/Themes/generic.xaml", UriKind.Relative ); - } - } -} diff --git a/source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs b/source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs deleted file mode 100644 index 9fbef9e9..00000000 --- a/source/Components/Xceed.Wpf.AvalonDock/Themes/Theme.cs +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************************* - - 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; - -namespace Xceed.Wpf.AvalonDock.Themes -{ - public abstract class Theme : DependencyObject - { - public Theme() - { - } - - public abstract Uri GetResourceUri(); - } -} 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..8b848ae3 100644 --- a/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml +++ b/source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml @@ -3,7 +3,7 @@ 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.VS2013.Themes;assembly=AvalonDock.Themes.VS2013" xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib" > diff --git a/source/MLibTest/MLibTest/Demos/Converters/ActiveDocumentConverter.cs b/source/MLibTest/MLibTest/Demos/Converters/ActiveDocumentConverter.cs index 03461a10..fda8a86a 100644 --- a/source/MLibTest/MLibTest/Demos/Converters/ActiveDocumentConverter.cs +++ b/source/MLibTest/MLibTest/Demos/Converters/ActiveDocumentConverter.cs @@ -1,6 +1,6 @@ namespace MLibTest.Demos.Demos.Converters { - using AvalonDock.MVVMTestApp; + using MLibTest.Demos.ViewModels.AD; using System; using System.Windows.Data; diff --git a/source/MLibTest/MLibTest/Demos/LayoutInitializer.cs b/source/MLibTest/MLibTest/Demos/LayoutInitializer.cs index eccc46c8..3cb57044 100644 --- a/source/MLibTest/MLibTest/Demos/LayoutInitializer.cs +++ b/source/MLibTest/MLibTest/Demos/LayoutInitializer.cs @@ -1,7 +1,7 @@ namespace MLibTest.Demos { using System.Linq; - using Xceed.Wpf.AvalonDock.Layout; + using AvalonDock.Layout; class LayoutInitializer : ILayoutUpdateStrategy { diff --git a/source/MLibTest/MLibTest/Demos/PanesStyleSelector.cs b/source/MLibTest/MLibTest/Demos/PanesStyleSelector.cs index 231d2059..bc702ba0 100644 --- a/source/MLibTest/MLibTest/Demos/PanesStyleSelector.cs +++ b/source/MLibTest/MLibTest/Demos/PanesStyleSelector.cs @@ -2,7 +2,7 @@ { using System.Windows.Controls; using System.Windows; - using AvalonDock.MVVMTestApp; + using MLibTest.Demos.ViewModels.AD; class PanesStyleSelector : StyleSelector { diff --git a/source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs b/source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs index 7a5c39a9..f7f373f8 100644 --- a/source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs +++ b/source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs @@ -2,9 +2,9 @@ { using System.Windows.Controls; using System.Windows; - using Xceed.Wpf.AvalonDock.Layout; - using AvalonDock.MVVMTestApp; + using AvalonDock.Layout; using AvalonDock.Tools; + using MLibTest.Demos.ViewModels.AD; /// /// 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..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 AvalonDock.MVVMTestApp; - - /// - /// 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/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..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 AvalonDock.MVVMTestApp; - - /// - /// 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 36c9e751..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 AvalonDock.MVVMTestApp; - - /// - /// 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 ef5bfd32..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 AvalonDock.MVVMTestApp; - - /// - /// 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/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..f642dc7c 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..b4a372d6 100644 --- a/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs +++ b/source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs @@ -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) @@ -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) @@ -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); @@ -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) 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/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..5bb78ef0 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() diff --git a/source/TestApp/App.xaml b/source/TestApp/App.xaml index 44792508..a4e41940 100644 --- a/source/TestApp/App.xaml +++ b/source/TestApp/App.xaml @@ -1,24 +1,17 @@ - + 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/TestApp/App.xaml.cs b/source/TestApp/App.xaml.cs index c766f475..d4a60d10 100644 --- a/source/TestApp/App.xaml.cs +++ b/source/TestApp/App.xaml.cs @@ -1,28 +1,13 @@ /************************************************************************ - 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; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; using System.Windows; -using System.Windows.Interop; -using System.Windows.Input; -using System.Diagnostics; namespace TestApp { diff --git a/source/TestApp/MainWindow.xaml b/source/TestApp/MainWindow.xaml index 0318e243..ac4c440c 100644 --- a/source/TestApp/MainWindow.xaml +++ b/source/TestApp/MainWindow.xaml @@ -1,26 +1,17 @@ - + - + diff --git a/source/TestApp/TestUserControl.xaml b/source/TestApp/TestUserControl.xaml index 23e205ff..b164e968 100644 --- a/source/TestApp/TestUserControl.xaml +++ b/source/TestApp/TestUserControl.xaml @@ -1,19 +1,12 @@ - - + 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 + ************************************************************************--> + - - - - - - + + + + + +