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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e127a73
Moved Xceed.Wpf.AvalonDock to AvalonDock along with unit test prject …
Dirkster99 Dec 11, 2019
4e45c09
Enabled MVVMTestApp for usage with AvalonDock library and namespace
Dirkster99 Dec 11, 2019
1f8d8c7
Adjusting MLibTest/Generic Theme to AvalonDock namespace
Dirkster99 Dec 11, 2019
f821a68
Adjusted AvalonDock.Themes.2013 and MLibTest for the AvalonDock names…
Dirkster99 Dec 11, 2019
682c05f
Adjusted Metro Theme and MLibTest for AvalonDock namespace
Dirkster99 Dec 11, 2019
accf6c2
Adjusted Metro Root namespace to AvalonDock.Themes
Dirkster99 Dec 11, 2019
9d9e993
Expression Theme and MLibTest adjusted for AvalonDock namespace
Dirkster99 Dec 11, 2019
82ed8e8
Adjusted Winforms Test App and VS2010, Aero themes for AvalonDock nam…
Dirkster99 Dec 11, 2019
7509eac
Replaced Code File Line Column
Dirkster99 Dec 11, 2019
b8b424e
Replaced 'xcad' namespace short-cut with 'avalondock'
Dirkster99 Dec 11, 2019
f9012dc
Removed ads in file headers and adjusted license information to be co…
Dirkster99 Dec 11, 2019
a6f69bb
Adjusted file paths to their namespace/project equivalent
Dirkster99 Dec 11, 2019
d30e6e9
Update appveyor.yml
Dirkster99 Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjusted Metro Theme and MLibTest for AvalonDock namespace
  • Loading branch information
@Dirkster99
Dirkster99 committed Dec 11, 2019
commit 682c05f7458121d8e5af6e2e592694c51d736eea
2 changes: 1 addition & 1 deletion source/AvalonDock.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock", "Components\Xc
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.VS2013", "Components\Xceed.Wpf.AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}"
EndProject
Expand Down
70 changes: 35 additions & 35 deletions .../Xceed.Wpf.AvalonDock.Themes.Metro.csproj → ...emes.Metro/AvalonDock.Themes.Metro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.00</Version>
<AssemblyVersion>4.00</AssemblyVersion>
<FileVersion>4.00</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2019</Copyright>
<Description>This assembly implements a docking layout system for WPF.</Description>
<PackageProjectUrl>https://github.com/Dirkster99/AvalonDock</PackageProjectUrl>
<RepositoryUrl>https://github.com/Dirkster99/AvalonDock</RepositoryUrl>
<PackageId>Dirkster.AvalonDock.Themes.Metro</PackageId>
<Authors>https://github.com/Dirkster99/AvalonDock</Authors>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
</PropertyGroup>
<ItemGroup>
<Resource Include="**\*.png" />
</ItemGroup>
<!-- NuGet Packaging -->
<ItemGroup>
<None Include="LICENSE.txt" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>AvalonDock.Themes.Metro</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.00</Version>
<AssemblyVersion>4.00</AssemblyVersion>
<FileVersion>4.00</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2019</Copyright>
<Description>This assembly implements a docking layout system for WPF.</Description>
<PackageProjectUrl>https://github.com/Dirkster99/AvalonDock</PackageProjectUrl>
<RepositoryUrl>https://github.com/Dirkster99/AvalonDock</RepositoryUrl>
<PackageId>Dirkster.AvalonDock.Themes.Metro</PackageId>
<Authors>https://github.com/Dirkster99/AvalonDock</Authors>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
</PropertyGroup>

<ItemGroup>
<Resource Include="**\*.png" />
</ItemGroup>

<!-- NuGet Packaging -->
<ItemGroup>
<None Include="LICENSE.txt" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ This program is provided to you under the terms of the Microsoft Public

using System;

namespace Xceed.Wpf.AvalonDock.Themes
namespace AvalonDock.Themes
{
public class MetroTheme : Theme
{
public override Uri GetResourceUri()
{
return new Uri(
"/Xceed.Wpf.AvalonDock.Themes.Metro;component/Theme.xaml",
"/AvalonDock.Themes.Metro;component/Theme.xaml",
UriKind.Relative);
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ This program is provided to you under the terms of the Microsoft Public
)]


[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )]
[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "AvalonDock.Themes" )]
14 changes: 7 additions & 7 deletions source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock">
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">

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Brushes.xaml" />
Expand Down
4 changes: 2 additions & 2 deletions source/MLibTest/MLibTest/MLibTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
</ItemGroup>

<ItemGroup>
<!--ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj" />
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj" /-->
<!--ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj" /-->
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Metro\AvalonDock.Themes.Metro.csproj" />
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj" />
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
<ProjectReference Include="..\..\MLibTest\MLibTest_Components\ServiceLocator\ServiceLocator.csproj" />
Expand Down
10 changes: 5 additions & 5 deletions source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ private void CreateDefaultsSettings(ISettingsManager settings
settings.Themes.AddThemeInfo("VS 2013 Blue", new List<Uri> { });
settings.Themes.AddThemeInfo("VS 2013 Dark", new List<Uri> { });
settings.Themes.AddThemeInfo("VS 2013 Light", new List<Uri> { });
////
//// settings.Themes.AddThemeInfo("Metro", new List<Uri> { });

settings.Themes.AddThemeInfo("Metro", new List<Uri> { });
////
//// settings.Themes.AddThemeInfo("Expression Dark", new List<Uri> { });
//// settings.Themes.AddThemeInfo("Expression Light", new List<Uri> { });
Expand Down Expand Up @@ -220,7 +220,7 @@ private void CreateDefaultsSettings(ISettingsManager settings
{
Debug.WriteLine(exp);
}
/***

try
{
// Adding Generic theme (which is really based on Light theme in MLib)
Expand All @@ -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);
Expand All @@ -240,7 +240,7 @@ private void CreateDefaultsSettings(ISettingsManager settings
{
Debug.WriteLine(exp);
}

/***
try
{
// Adding Generic theme (which is really based on Light theme in MLib)
Expand Down