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
Adjusting MLibTest/Generic Theme to AvalonDock namespace
  • Loading branch information
@Dirkster99
Dirkster99 committed Dec 11, 2019
commit 1f8d8c73866574868223abeaac192a9842437711
1 change: 0 additions & 1 deletion source/MLibTest/MLibTest/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
<Application.Resources>
</Application.Resources>
Expand Down
5 changes: 4 additions & 1 deletion source/MLibTest/MLibTest/BindToMLib/AvalonDock_Dark_LightBrushs.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
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;assembly=AvalonDock"

xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib"
>
<!--
xmlns:reskeys="clr-namespace:Xceed.Wpf.AvalonDock.Themes.VS2013.Themes;assembly=Xceed.Wpf.AvalonDock.Themes.VS2013"
-->

<!--AccentColor -->
<SolidColorBrush x:Key="{x:Static reskeys:ResourceKeys.AutoHideTabHoveredText}"
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/Converters/ActiveDocumentConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace MLibTest.Demos.Demos.Converters
{
using AvalonDock.MVVMTestApp;
using MLibTest.Demos.ViewModels.AD;
using System;
using System.Windows.Data;

Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/LayoutInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace MLibTest.Demos
{
using System.Linq;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

class LayoutInitializer : ILayoutUpdateStrategy
{
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/PanesStyleSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using System.Windows.Controls;
using System.Windows;
using AvalonDock.MVVMTestApp;
using MLibTest.Demos.ViewModels.AD;

class PanesStyleSelector : StyleSelector
{
Expand Down
4 changes: 2 additions & 2 deletions source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <summary>
/// Implements a <see ref="DataTemplateSelector"/> for AvalonDock's documents and toolwindows.
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/AD/FileViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AvalonDock.MVVMTestApp
namespace MLibTest.Demos.ViewModels.AD
{
using MLibTest.Demos.ViewModels.Interfaces;
using MLibTest.ViewModels.Base;
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/AD/PaneViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AvalonDock.MVVMTestApp
namespace MLibTest.Demos.ViewModels.AD
{
using MLibTest.ViewModels.Base;
using System.Windows.Media;
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/AD/ToolViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AvalonDock.MVVMTestApp
namespace MLibTest.Demos.ViewModels.AD
{
internal class ToolViewModel : PaneViewModel
{
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/Interfaces/IWorkSpaceViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace MLibTest.Demos.ViewModels.Interfaces
{
using AvalonDock.MVVMTestApp;
using MLibTest.Demos.ViewModels.AD;
using System;
using System.Collections.Generic;

Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/Tools/ColorPickerViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using MLibTest.ViewModels.Base;
using MLib.Interfaces;
using Settings.Interfaces;
using AvalonDock.MVVMTestApp;
using MLibTest.Demos.ViewModels.AD;

/// <summary>
/// Implements the viewmodel that drives the view a Color Picker tool window.
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/Tools/FileStatsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool1_ViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using MLibTest.ViewModels.Base;
using MLib.Interfaces;
using Settings.Interfaces;
using AvalonDock.MVVMTestApp;
using MLibTest.Demos.ViewModels.AD;

/// <summary>
/// Implements the viewmodel that drives a sample tool window view.
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool2_ViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using MLibTest.ViewModels.Base;
using MLib.Interfaces;
using Settings.Interfaces;
using AvalonDock.MVVMTestApp;
using MLibTest.Demos.ViewModels.AD;

/// <summary>
/// Implements the viewmodel that drives a sample tool window view.
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/Demos/ViewModels/Tools/Tool3_ViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using MLibTest.ViewModels.Base;
using MLib.Interfaces;
using Settings.Interfaces;
using AvalonDock.MVVMTestApp;
using MLibTest.Demos.ViewModels.AD;

/// <summary>
/// Implements the viewmodel that drives a sample tool window view.
Expand Down
4 changes: 2 additions & 2 deletions source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions source/MLibTest/MLibTest/MLibTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj" />
<!--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.VS2013\Xceed.Wpf.AvalonDock.Themes.VS2013.csproj" />
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj" />
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.VS2013\Xceed.Wpf.AvalonDock.Themes.VS2013.csproj" /-->
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
<ProjectReference Include="..\..\MLibTest\MLibTest_Components\ServiceLocator\ServiceLocator.csproj" />
<ProjectReference Include="..\..\MLibTest\MLibTest_Components\Settings\SettingsModel\SettingsModel.csproj" />
<ProjectReference Include="..\..\MLibTest\MLibTest_Components\Settings\Settings\Settings.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions source/MLibTest/MLibTest/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<Grid xmlns:bindLocal="clr-namespace:MLibTest.Demos"
xmlns:ThemeBehav="clr-namespace:MLib.Behaviors;assembly=MLib"

xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
xmlns:avalonDock="clr-namespace:AvalonDock;assembly=AvalonDock"
xmlns:avalonDockControls="clr-namespace:AvalonDock.Controls;assembly=AvalonDock"
xmlns:avalonDockLayout="clr-namespace:AvalonDock.Layout;assembly=AvalonDock"
xmlns:conv="clr-namespace:MLibTest.Demos.Demos.Converters"
>
<Grid.Resources>
Expand Down
2 changes: 1 addition & 1 deletion source/MLibTest/MLibTest/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Linq;
using System.Windows;
using System.Windows.Input;
using Xceed.Wpf.AvalonDock.Layout.Serialization;
using AvalonDock.Layout.Serialization;

/// <summary>
/// Interaction logic for MainWindow.xaml
Expand Down
24 changes: 13 additions & 11 deletions source/MLibTest/MLibTest/ViewModels/AppLifeCycleViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ private void CreateDefaultsSettings(ISettingsManager settings
{
settings.Themes.RemoveAllThemeInfos();
settings.Themes.AddThemeInfo("Generic", new List<Uri> { });
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("Expression Dark", new List<Uri> { });
settings.Themes.AddThemeInfo("Expression Light", new List<Uri> { });
//// 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("Expression Dark", new List<Uri> { });
//// settings.Themes.AddThemeInfo("Expression Light", new List<Uri> { });

try
{
Expand All @@ -137,7 +137,7 @@ private void CreateDefaultsSettings(ISettingsManager settings
appearance.AddThemeResources("Generic", new List<Uri>
{
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)
Expand All @@ -148,7 +148,7 @@ private void CreateDefaultsSettings(ISettingsManager settings
{
Debug.WriteLine(exp);
}

/***
try
{
// Adding Generic theme (which is really based on Light theme in MLib)
Expand Down Expand Up @@ -284,8 +284,10 @@ private void CreateDefaultsSettings(ISettingsManager settings
{
Debug.WriteLine(exp);
}
***/

appearance.SetDefaultTheme(settings.Themes, "VS 2013 Dark");
//// appearance.SetDefaultTheme(settings.Themes, "VS 2013 Dark");
appearance.SetDefaultTheme(settings.Themes, "Generic");

try
{
Expand Down