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
Enabled MVVMTestApp for usage with AvalonDock library and namespace
  • Loading branch information
@Dirkster99
Dirkster99 committed Dec 11, 2019
commit 4e45c09fbe6c4e0f68c07158f5284255e4a1e8be
14 changes: 5 additions & 9 deletions source/MVVMTestApp/FileStatsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using System.Windows.Media.Imaging;
using System.Windows.Media;

namespace AvalonDock.MVVMTestApp
namespace AvalonDock.MVVMTestApp
{
using System;
using System.IO;
using System.Windows.Media.Imaging;

class FileStatsViewModel : ToolViewModel
{
public FileStatsViewModel()
Expand Down
10 changes: 5 additions & 5 deletions source/MVVMTestApp/FileViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.IO;
using System.Windows.Input;
using System.Windows.Media;

namespace AvalonDock.MVVMTestApp
namespace AvalonDock.MVVMTestApp
{
using System.IO;
using System.Windows.Input;
using System.Windows.Media;

class FileViewModel : PaneViewModel
{
static ImageSourceConverter ISC = new ImageSourceConverter();
Expand Down
8 changes: 4 additions & 4 deletions source/MVVMTestApp/LayoutInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Linq;
using Xceed.Wpf.AvalonDock.Layout;

namespace AvalonDock.MVVMTestApp
namespace AvalonDock.MVVMTestApp
{
using System.Linq;
using AvalonDock.Layout;

class LayoutInitializer : ILayoutUpdateStrategy
{
public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorableToShow, ILayoutContainer destinationContainer)
Expand Down
2 changes: 1 addition & 1 deletion source/MVVMTestApp/MVVMTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj" />
<ProjectReference Include="..\Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions source/MVVMTestApp/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Window x:Class="AvalonDock.MVVMTestApp.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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:sys="clr-namespace:System;assembly=System.Runtime"
xmlns:local="clr-namespace:AvalonDock.MVVMTestApp"
Expand Down
8 changes: 4 additions & 4 deletions source/MVVMTestApp/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
using System.Net.Sockets;
using System.Net;
using System.IO;
using Xceed.Wpf.AvalonDock.Layout.Serialization;

namespace AvalonDock.MVVMTestApp
{
using AvalonDock.Layout.Serialization;

/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
Expand All @@ -36,7 +36,7 @@ public MainWindow()

void MainWindow_Loaded(object sender, RoutedEventArgs e)
{
var serializer = new Xceed.Wpf.AvalonDock.Layout.Serialization.XmlLayoutSerializer(dockManager);
var serializer = new AvalonDock.Layout.Serialization.XmlLayoutSerializer(dockManager);
serializer.LayoutSerializationCallback += (s, args) =>
{
args.Content = args.Content;
Expand All @@ -48,7 +48,7 @@ void MainWindow_Loaded(object sender, RoutedEventArgs e)

void MainWindow_Unloaded(object sender, RoutedEventArgs e)
{
var serializer = new Xceed.Wpf.AvalonDock.Layout.Serialization.XmlLayoutSerializer(dockManager);
var serializer = new AvalonDock.Layout.Serialization.XmlLayoutSerializer(dockManager);
serializer.Serialize(@".\AvalonDock.config");
}

Expand Down
6 changes: 3 additions & 3 deletions source/MVVMTestApp/PaneViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Windows.Media;

namespace AvalonDock.MVVMTestApp
namespace AvalonDock.MVVMTestApp
{
using System.Windows.Media;

class PaneViewModel : ViewModelBase
{
public PaneViewModel()
Expand Down
8 changes: 4 additions & 4 deletions source/MVVMTestApp/PanesStyleSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Windows.Controls;
using System.Windows;

namespace AvalonDock.MVVMTestApp
namespace AvalonDock.MVVMTestApp
{
using System.Windows.Controls;
using System.Windows;

class PanesStyleSelector : StyleSelector
{
public Style ToolStyle
Expand Down
4 changes: 2 additions & 2 deletions source/MVVMTestApp/PanesTemplateSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Windows.Controls;
using System.Windows;
using Xceed.Wpf.AvalonDock.Layout;

namespace AvalonDock.MVVMTestApp
{
using AvalonDock.Layout;

class PanesTemplateSelector : DataTemplateSelector
{
public PanesTemplateSelector()
Expand Down