From 11115a6951c46e92f9091e28c7d187b7e584478f Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Wed, 7 Mar 2018 21:55:06 +0100 Subject: [PATCH] Added Version 3.3 source from XCeed --- source/AvalonDock.sln | 30 +- .../AssemblyVersionInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Theme.xaml | 3443 +++++----- .../Xceed.Wpf.AvalonDock.Themes.Metro.csproj | 36 - .../AssemblyVersionInfo.cs | 2 +- .../Controls/LayoutAnchorControl.cs | 312 +- .../Controls/LayoutAnchorSideControl.cs | 385 +- .../Controls/LayoutAnchorableControl.cs | 217 +- .../LayoutAnchorableFloatingWindowControl.cs | 56 + .../Controls/LayoutAnchorablePaneControl.cs | 5 - .../Controls/LayoutAutoHideWindowControl.cs | 894 +-- .../Controls/LayoutDocumentControl.cs | 1 + .../Controls/LayoutDocumentPaneControl.cs | 109 +- .../Controls/LayoutFloatingWindowControl.cs | 7 +- .../Controls/LayoutItem.cs | 2035 +++--- .../Controls/NavigatorWindow.cs | 591 +- ...rableContextMenuHideVisibilityConverter.cs | 49 + .../Xceed.Wpf.AvalonDock/DockingManager.cs | 5535 +++++++++-------- .../Layout/LayoutAnchorable.cs | 1106 ++-- .../Layout/LayoutContent.cs | 2 +- .../Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs | 1588 ++--- .../Properties/AssemblyInfo.cs | 2 +- .../Xceed.Wpf.AvalonDock/Themes/generic.xaml | 2234 ++++--- .../Xceed.Wpf.AvalonDock.csproj | 37 +- 25 files changed, 10005 insertions(+), 8681 deletions(-) create mode 100644 source/Components/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln index 97fd238c..f9657b75 100644 --- a/source/AvalonDock.sln +++ b/source/AvalonDock.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2003 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock.TestApp", "AvalonDock.TestApp\AvalonDock.TestApp.csproj", "{339BC0D5-2A54-40ED-9850-7ED65182E6E1}" EndProject @@ -68,16 +68,16 @@ Global {AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|x86.Build.0 = Release|x86 {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.ActiveCfg = Debug|x64 - {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.Build.0 = Debug|x64 + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.ActiveCfg = Debug|Any CPU + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.Build.0 = Debug|Any CPU {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x86.ActiveCfg = Debug|Any CPU {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x86.Build.0 = Debug|Any CPU {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.ActiveCfg = Release|Any CPU {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.Build.0 = Release|Any CPU - {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.ActiveCfg = Release|x64 - {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.Build.0 = Release|x64 - {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.ActiveCfg = Release|x86 - {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.Build.0 = Release|x86 + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.ActiveCfg = Release|Any CPU + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.Build.0 = Release|Any CPU + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.ActiveCfg = Release|Any CPU + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.Build.0 = Release|Any CPU {488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|Any CPU.Build.0 = Debug|Any CPU {488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|x64.ActiveCfg = Debug|x64 @@ -92,16 +92,16 @@ Global {488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Release|x86.Build.0 = Release|x86 {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.ActiveCfg = Debug|x64 - {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.Build.0 = Debug|x64 - {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.ActiveCfg = Debug|x64 - {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.Build.0 = Debug|x64 + {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.ActiveCfg = Debug|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.Build.0 = Debug|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.ActiveCfg = Debug|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.Build.0 = Debug|Any CPU {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.Build.0 = Release|Any CPU - {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.ActiveCfg = Release|x64 - {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.Build.0 = Release|x64 - {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.ActiveCfg = Release|x86 - {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.Build.0 = Release|x86 + {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.ActiveCfg = Release|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.Build.0 = Release|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.ActiveCfg = Release|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.Build.0 = Release|Any CPU {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs index 04bbed86..6d3eb8a0 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs @@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "2.3"; + public const string BaseVersion = "3.3"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string Version = BaseVersion + ".0.0"; diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs index 6d82a9ec..4f0eb25b 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs @@ -25,12 +25,12 @@ This program is provided to you under the terms of the Microsoft Public // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit - AvalonDock Metro Theme" )] +[assembly: AssemblyTitle( "Xceed Toolkit for WPF - AvalonDock Metro Theme" )] [assembly: AssemblyDescription( "This assembly implements the Metro Theme for the AvalonDock layout system." )] [assembly: AssemblyCompany( "Xceed Software Inc." )] -[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit - AvalonDock" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2014" )] +[assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )] +[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )] @@ -64,6 +64,6 @@ This program is provided to you under the terms of the Microsoft Public #pragma warning disable 1699 [assembly: AssemblyDelaySign( false )] -////[assembly: AssemblyKeyFile( @"..\..\sn.snk" )] +[assembly: AssemblyKeyFile( @"..\..\sn.snk" )] [assembly: AssemblyKeyName( "" )] #pragma warning restore 1699 diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml index 9f2ae367..a1495ea4 100644 --- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml +++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml @@ -14,1367 +14,1841 @@ **********************************************************************************--> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + Grid.Column="1" + Grid.Row="1" /> + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + + + + + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - + + + + + + + + + + + + - + + + + + - - - + - - - - - - - - - - - - - - - + + + + - - - + + + + + + + + + + + + + + + + + - - - + + + + - - - + + + + - - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + - + - + + + + + - + + + + + - + + + + + - + + + + + - + + + - + + + + + + - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - - + + + + - - diff --git a/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj b/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj index 28bea22e..58f3f0ba 100644 --- a/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj +++ b/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj @@ -42,42 +42,6 @@ - - true - bin\x86\Debug\ - DEBUG - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - true - bin\x64\Debug\ - DEBUG - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - @@ -136,6 +100,7 @@ +