Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Namespace Refactoring to AvalonDock (reverting to original authoring in version 2.0 and earlier) #102

Merged
merged 13 commits into from
Dec 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 3.5.{build}
version: 4.0.{build}

branches:

Expand Down
2 changes: 1 addition & 1 deletion source/AutomationTest/AvalonDockTest/AnchorablePaneTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
13 changes: 6 additions & 7 deletions source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@
<None Include="packages.config" />
<None Include="Testsettings.runsettings" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
<Project>{db81988f-e0f2-45a0-a1fd-8c37f3d35244}</Project>
<Name>Xceed.Wpf.AvalonDock</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="TestApp.xaml">
<Generator>MSBuild:Compile</Generator>
Expand All @@ -100,7 +94,12 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\..\Components\AvalonDock\AvalonDock.csproj">
<Project>{db81988f-e0f2-45a0-a1fd-8c37f3d35244}</Project>
<Name>AvalonDock</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

[TestClass]
public sealed class DockingUtilitiesTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions source/AutomationTest/AvalonDockTest/LayoutAnchorableTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<Window x:Class="AvalonDockTest.views.AnchorablePaneTestWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
xmlns:avalondock="https://github.com/Dirkster99/AvalonDock"
Height="600" Width="800">
<xcad:DockingManager x:Name="dockingManager" AllowMixedOrientation="True">
<xcad:LayoutRoot>
<xcad:LayoutPanel Orientation="Horizontal">
<xcad:LayoutDocumentPaneGroup>
<xcad:LayoutDocumentPane>
<xcad:LayoutDocument Title="Screen1">
<avalondock:DockingManager x:Name="dockingManager" AllowMixedOrientation="True">
<avalondock:LayoutRoot>
<avalondock:LayoutPanel Orientation="Horizontal">
<avalondock:LayoutDocumentPaneGroup>
<avalondock:LayoutDocumentPane>
<avalondock:LayoutDocument Title="Screen1">
<StackPanel>
<Label Content="Screen1" />
<Button Click="Hide_Click">Hide Screen3</Button>
<Button Click="Close_Click">Close Screen2</Button>
<Button Click="Show_Click">Show Screen3</Button>
</StackPanel>
</xcad:LayoutDocument>
</xcad:LayoutDocumentPane>
</xcad:LayoutDocumentPaneGroup>
<xcad:LayoutAnchorablePane DockWidth="200">
<xcad:LayoutAnchorable x:Name="Screen2" Title="Screen2">
</avalondock:LayoutDocument>
</avalondock:LayoutDocumentPane>
</avalondock:LayoutDocumentPaneGroup>
<avalondock:LayoutAnchorablePane DockWidth="200">
<avalondock:LayoutAnchorable x:Name="Screen2" Title="Screen2">
<Label Content="Screen2" />
</xcad:LayoutAnchorable>
</xcad:LayoutAnchorablePane>
</xcad:LayoutPanel>
<xcad:LayoutRoot.LeftSide>
<xcad:LayoutAnchorSide>
<xcad:LayoutAnchorGroup>
<xcad:LayoutAnchorable x:Name="Screen3" Title="Screen3">
</avalondock:LayoutAnchorable>
</avalondock:LayoutAnchorablePane>
</avalondock:LayoutPanel>
<avalondock:LayoutRoot.LeftSide>
<avalondock:LayoutAnchorSide>
<avalondock:LayoutAnchorGroup>
<avalondock:LayoutAnchorable x:Name="Screen3" Title="Screen3">
<Label Content="Screen3" />
</xcad:LayoutAnchorable>
</xcad:LayoutAnchorGroup>
</xcad:LayoutAnchorSide>
</xcad:LayoutRoot.LeftSide>
</xcad:LayoutRoot>
</xcad:DockingManager>
</avalondock:LayoutAnchorable>
</avalondock:LayoutAnchorGroup>
</avalondock:LayoutAnchorSide>
</avalondock:LayoutRoot.LeftSide>
</avalondock:LayoutRoot>
</avalondock:DockingManager>
</Window>
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<Window x:Class="AvalonDockTest.Views.LayoutAnchorableFloatingWindowControlTestWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
xmlns:avalondock="https://github.com/Dirkster99/AvalonDock"
Title="Exception Window" Height="800" Width="1200">
<Grid>
<TabControl x:Name="tabControl" SelectedIndex="0">
<TabItem Header="Tab 1">
<xcad:DockingManager x:Name="dockingManager" AllowMixedOrientation="True">
<xcad:LayoutRoot>
<xcad:LayoutPanel Orientation="Horizontal">
<xcad:LayoutAnchorablePaneGroup Orientation="Vertical" DockWidth="40*">
<xcad:LayoutAnchorablePane>
<xcad:LayoutAnchorable x:Name="Window1" ContentId="Window1" Title="Window 1" CanHide="False" CanAutoHide="False" CanFloat="True">
<avalondock:DockingManager x:Name="dockingManager" AllowMixedOrientation="True">
<avalondock:LayoutRoot>
<avalondock:LayoutPanel Orientation="Horizontal">
<avalondock:LayoutAnchorablePaneGroup Orientation="Vertical" DockWidth="40*">
<avalondock:LayoutAnchorablePane>
<avalondock:LayoutAnchorable x:Name="Window1" ContentId="Window1" Title="Window 1" CanHide="False" CanAutoHide="False" CanFloat="True">
<Grid></Grid>
</xcad:LayoutAnchorable>
</xcad:LayoutAnchorablePane>
<xcad:LayoutAnchorablePane>
<xcad:LayoutAnchorable x:Name="Window2" ContentId="Window2" Title="Window 2" CanAutoHide="False" CanHide="True" CanClose="True">
</avalondock:LayoutAnchorable>
</avalondock:LayoutAnchorablePane>
<avalondock:LayoutAnchorablePane>
<avalondock:LayoutAnchorable x:Name="Window2" ContentId="Window2" Title="Window 2" CanAutoHide="False" CanHide="True" CanClose="True">
<Grid></Grid>
</xcad:LayoutAnchorable>
</xcad:LayoutAnchorablePane>
</xcad:LayoutAnchorablePaneGroup>
<xcad:LayoutAnchorablePane DockWidth="60*">
<xcad:LayoutAnchorable ContentId="Window3" Title="Window 3" CanHide="True" CanAutoHide="False" CanClose="True">
</avalondock:LayoutAnchorable>
</avalondock:LayoutAnchorablePane>
</avalondock:LayoutAnchorablePaneGroup>
<avalondock:LayoutAnchorablePane DockWidth="60*">
<avalondock:LayoutAnchorable ContentId="Window3" Title="Window 3" CanHide="True" CanAutoHide="False" CanClose="True">
<Grid></Grid>
</xcad:LayoutAnchorable>
</xcad:LayoutAnchorablePane>
</xcad:LayoutPanel>
</xcad:LayoutRoot>
</xcad:DockingManager>
</avalondock:LayoutAnchorable>
</avalondock:LayoutAnchorablePane>
</avalondock:LayoutPanel>
</avalondock:LayoutRoot>
</avalondock:DockingManager>
</TabItem>
<TabItem Header="Tab 2"/>
<xcad:DockingManager x:Name="dockingManager2" AllowMixedOrientation="True">
</xcad:DockingManager>
<avalondock:DockingManager x:Name="dockingManager2" AllowMixedOrientation="True">
</avalondock:DockingManager>
</TabControl>
</Grid>
</Window>
12 changes: 6 additions & 6 deletions source/AvalonDock.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 24 additions & 24 deletions source/CleanAll.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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



Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
23 changes: 23 additions & 0 deletions source/Components/AvalonDock.Themes.Aero/AeroTheme.cs
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
Loading