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 1 commit
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
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Adjusted file paths to their namespace/project equivalent
  • Loading branch information
Dirkster99 committed Dec 11, 2019
commit a6f69bbdaac64d5701b8fc8e6105e925bba742da
2 changes: 1 addition & 1 deletion source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</Page>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj">
<ProjectReference Include="..\..\Components\AvalonDock\AvalonDock.csproj">
<Project>{db81988f-e0f2-45a0-a1fd-8c37f3d35244}</Project>
<Name>AvalonDock</Name>
</ProjectReference>
Expand Down
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}") = "AvalonDock", "Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock", "Components\AvalonDock\AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Expression", "Components\AvalonDock.Themes.Expression\AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Metro", "Components\AvalonDock.Themes.Metro\AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2013", "Components\Xceed.Wpf.AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2013", "Components\AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MLibTest_Components", "MLibTest_Components", "{72045D3A-A982-4C69-8FB8-6B601363D7ED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Settings", "MLibTest\MLibTest_Components\Settings\Settings\Settings.csproj", "{2807B493-CC2E-402E-901A-EB138698FEDC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2010", "Components\Xceed.Wpf.AvalonDock.Themes.VS2010\AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2010", "Components\AvalonDock.Themes.VS2010\AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Aero", "Components\Xceed.Wpf.AvalonDock.Themes.Aero\AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Aero", "Components\AvalonDock.Themes.Aero\AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutomationTest", "AutomationTest", "{20876020-CC7D-46BD-9B80-E4F01FC0FD31}"
EndProject
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
Expand Up @@ -30,6 +30,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
<ProjectReference Include="..\AvalonDock\AvalonDock.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
<ProjectReference Include="..\AvalonDock\AvalonDock.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -610,15 +610,15 @@
Command="{Binding Path=NewHorizontalTabGroupCommand}"
Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
<MenuItem.Icon>
<Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Aero/Images/HTabGroup.png" Stretch="Uniform" Width="14"/>
<Image Source="/AvalonDock;component/Themes/Aero/Images/HTabGroup.png" Stretch="Uniform" Width="14"/>
</MenuItem.Icon>
</MenuItem>

<MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}"
Command="{Binding Path=NewVerticalTabGroupCommand}"
Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
<MenuItem.Icon>
<Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Aero/Images/VTabGroup.png" Stretch="Uniform" Width="14"/>
<Image Source="/AvalonDock;component/Themes/Aero/Images/VTabGroup.png" Stretch="Uniform" Width="14"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
<ProjectReference Include="..\AvalonDock\AvalonDock.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
<ProjectReference Include="..\AvalonDock\AvalonDock.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
<ProjectReference Include="..\AvalonDock\AvalonDock.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,105 +1,105 @@
/************************************************************************
AvalonDock
Copyright (C) 2007-2013 Xceed Software Inc.
This program is provided to you under the terms of the Microsoft Public
License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
************************************************************************/
using System;
using System.Windows.Controls;
using System.Windows;
using System.Windows.Data;
using AvalonDock.Layout;
namespace AvalonDock.Controls
{
public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
{
#region Members
private LayoutAnchorablePane _model;
#endregion
#region Constructors
static LayoutAnchorablePaneControl()
{
FocusableProperty.OverrideMetadata(typeof(LayoutAnchorablePaneControl), new FrameworkPropertyMetadata(false));
}
public LayoutAnchorablePaneControl(LayoutAnchorablePane model)
{
if (model == null)
throw new ArgumentNullException("model");
_model = model;
SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this });
SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
// Handle SizeChanged event instead of LayoutUpdated. It will exlude fluctuations of Actual size values.
// this.LayoutUpdated += new EventHandler( OnLayoutUpdated );
this.SizeChanged += OnSizeChanged;
}
#endregion
#region Properties
public ILayoutElement Model
{
get
{
return _model;
}
}
#endregion
#region Overrides
protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
{
if ((_model != null) && (_model.SelectedContent != null))
{
_model.SelectedContent.IsActive = true;
}
base.OnGotKeyboardFocus(e);
}
protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
{
base.OnMouseLeftButtonDown(e);
if (!e.Handled && (_model != null) && _model.SelectedContent != null)
_model.SelectedContent.IsActive = true;
}
protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e)
{
base.OnMouseRightButtonDown(e);
if (!e.Handled && (_model != null) && _model.SelectedContent != null)
_model.SelectedContent.IsActive = true;
}
#endregion
#region Private Methods
private void OnSizeChanged(object sender, SizeChangedEventArgs e)
{
var modelWithActualSize = _model as ILayoutPositionableElementWithActualSize;
modelWithActualSize.ActualWidth = ActualWidth;
modelWithActualSize.ActualHeight = ActualHeight;
}
#endregion
}
}
/************************************************************************
AvalonDock

Copyright (C) 2007-2013 Xceed Software Inc.

This program is provided to you under the terms of the Microsoft Public
License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
************************************************************************/

using System;
using System.Windows.Controls;
using System.Windows;
using System.Windows.Data;
using AvalonDock.Layout;

namespace AvalonDock.Controls
{
public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
{
#region Members

private LayoutAnchorablePane _model;

#endregion

#region Constructors

static LayoutAnchorablePaneControl()
{
FocusableProperty.OverrideMetadata(typeof(LayoutAnchorablePaneControl), new FrameworkPropertyMetadata(false));
}

public LayoutAnchorablePaneControl(LayoutAnchorablePane model)
{
if (model == null)
throw new ArgumentNullException("model");

_model = model;

SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this });
SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });

// Handle SizeChanged event instead of LayoutUpdated. It will exlude fluctuations of Actual size values.
// this.LayoutUpdated += new EventHandler( OnLayoutUpdated );
this.SizeChanged += OnSizeChanged;
}

#endregion

#region Properties

public ILayoutElement Model
{
get
{
return _model;
}
}

#endregion

#region Overrides

protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
{
if ((_model != null) && (_model.SelectedContent != null))
{
_model.SelectedContent.IsActive = true;
}

base.OnGotKeyboardFocus(e);
}

protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
{
base.OnMouseLeftButtonDown(e);

if (!e.Handled && (_model != null) && _model.SelectedContent != null)
_model.SelectedContent.IsActive = true;
}

protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e)
{
base.OnMouseRightButtonDown(e);

if (!e.Handled && (_model != null) && _model.SelectedContent != null)
_model.SelectedContent.IsActive = true;

}


#endregion

#region Private Methods

private void OnSizeChanged(object sender, SizeChangedEventArgs e)
{
var modelWithActualSize = _model as ILayoutPositionableElementWithActualSize;
modelWithActualSize.ActualWidth = ActualWidth;
modelWithActualSize.ActualHeight = ActualHeight;
}

#endregion
}
}
Loading