Merge pull request #334 from diluculo/avalondock

Upgrade AvalonDock.Themes to Version 4.0
tgjones · Aug 22, 2022 · 0c43b47 · 0c43b47
2 parents 22012ce + 0156ccd
commit 0c43b47
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/src/Gemini.Modules.Inspector/Resources/Resources.xaml b/src/Gemini.Modules.Inspector/Resources/Resources.xaml
@@ -3,7 +3,7 @@
                     xmlns:controls="clr-namespace:Gemini.Modules.Inspector.Controls"
                     xmlns:cal="http://www.caliburnproject.org"
                     xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                    xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
+                    xmlns:xcad="https://github.com/Dirkster99/AvalonDock"
                     xmlns:p="clr-namespace:Gemini.Modules.Inspector.Properties"
                     xmlns:gemini="http://schemas.timjones.io/gemini">
     <xctk:InverseBoolConverter x:Key="InverseBoolConverter" />

diff --git a/src/Gemini/Framework/Themes/BlueTheme.cs b/src/Gemini/Framework/Themes/BlueTheme.cs
@@ -33,7 +33,7 @@ public virtual IEnumerable<Uri> ApplicationResources
         {
             get
             {
-                yield return new Uri("pack://application:,,,/Xceed.Wpf.AvalonDock.Themes.VS2013;component/BlueTheme.xaml");
+                yield return new Uri("pack://application:,,,/AvalonDock.Themes.VS2013;component/BlueTheme.xaml");
                 yield return new Uri("pack://application:,,,/Gemini;component/Themes/VS2013/BlueTheme.xaml");
             }
         }

diff --git a/src/Gemini/Framework/Themes/DarkTheme.cs b/src/Gemini/Framework/Themes/DarkTheme.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Original source code from the Wide framework:
  * https://github.com/chandramouleswaran/Wide
  * 
@@ -33,7 +33,7 @@ public virtual IEnumerable<Uri> ApplicationResources
         {
             get
             {
-                yield return new Uri("pack://application:,,,/Xceed.Wpf.AvalonDock.Themes.VS2013;component/DarkTheme.xaml");
+                yield return new Uri("pack://application:,,,/AvalonDock.Themes.VS2013;component/DarkTheme.xaml");
                 yield return new Uri("pack://application:,,,/Gemini;component/Themes/VS2013/DarkTheme.xaml");
             }
         }
@@ -43,4 +43,4 @@ public virtual IEnumerable<Uri> MainWindowResources
             get { yield break; }
         }
     }
-}
+}
diff --git a/src/Gemini/Framework/Themes/LightTheme.cs b/src/Gemini/Framework/Themes/LightTheme.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Original source code from the Wide framework:
  * https://github.com/chandramouleswaran/Wide
  * 
@@ -33,7 +33,7 @@ public virtual IEnumerable<Uri> ApplicationResources
         {
             get
             {
-                yield return new Uri("pack://application:,,,/Xceed.Wpf.AvalonDock.Themes.VS2013;component/LightTheme.xaml");
+                yield return new Uri("pack://application:,,,/AvalonDock.Themes.VS2013;component/LightTheme.xaml");
                 yield return new Uri("pack://application:,,,/Gemini;component/Themes/VS2013/LightTheme.xaml");
             }
         }
@@ -43,4 +43,4 @@ public virtual IEnumerable<Uri> MainWindowResources
             get { yield break; }
         }
     }
-}
+}
diff --git a/src/Gemini/Gemini.csproj b/src/Gemini/Gemini.csproj
@@ -53,7 +53,7 @@
 
   <ItemGroup>
     <PackageReference Include="Caliburn.Micro" Version="4.0.173" />
-    <PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="3.6.2" />
+    <PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.60.0" />
     <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="4.6.78" />
     <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0660" />
     <PackageReference Include="System.ComponentModel.Composition" Version="4.7.0" Condition="$(TargetFramework) == 'net461'" />

diff --git a/src/Gemini/Modules/Shell/Controls/LayoutInitializer.cs b/src/Gemini/Modules/Shell/Controls/LayoutInitializer.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using Gemini.Framework;
 using Gemini.Framework.Services;
-using Xceed.Wpf.AvalonDock.Layout;
+using AvalonDock.Layout;
 
 namespace Gemini.Modules.Shell.Controls
 {
@@ -110,4 +110,4 @@ public void AfterInsertDocument(LayoutRoot layout, LayoutDocument anchorableShow
 
 	    }
 	}
-}
+}
diff --git a/src/Gemini/Modules/Shell/Views/LayoutUtility.cs b/src/Gemini/Modules/Shell/Views/LayoutUtility.cs
@@ -3,9 +3,9 @@
 using System.IO;
 using System.Threading;
 using Gemini.Framework;
-using Xceed.Wpf.AvalonDock;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Layout.Serialization;
+using AvalonDock;
+using AvalonDock.Layout;
+using AvalonDock.Layout.Serialization;
 
 namespace Gemini.Modules.Shell.Views
 {

diff --git a/src/Gemini/Modules/Shell/Views/ShellView.xaml b/src/Gemini/Modules/Shell/Views/ShellView.xaml
@@ -3,7 +3,7 @@
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
 			 xmlns:controls="clr-namespace:Gemini.Modules.Shell.Controls"
 			 xmlns:cal="http://www.caliburnproject.org"
-			 xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
+			 xmlns:xcad="https://github.com/Dirkster99/AvalonDock"
 			 xmlns:converters="clr-namespace:Gemini.Modules.Shell.Converters"
              xmlns:toolbarcontrols="clr-namespace:Gemini.Modules.ToolBars.Controls"
 			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 

diff --git a/src/Gemini/Modules/ToolBars/Views/ToolBarsView.xaml b/src/Gemini/Modules/ToolBars/Views/ToolBarsView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Gemini.Modules.ToolBars.Views.ToolBarsView"
+<UserControl x:Class="Gemini.Modules.ToolBars.Views.ToolBarsView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:xcad="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+             xmlns:xcad="clr-namespace:AvalonDock.Converters;assembly=AvalonDock"
              xmlns:controls="clr-namespace:Gemini.Modules.ToolBars.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="30" d:DesignWidth="300">

diff --git a/src/Gemini/Themes/VS2013/Controls/Menu.xaml b/src/Gemini/Themes/VS2013/Controls/Menu.xaml
@@ -13,7 +13,7 @@
 -->
 <ResourceDictionary 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:xcad="https://github.com/Dirkster99/AvalonDock">
 
     <Geometry x:Key="Checkmark">
         M 0,5.1 L 1.7,5.2 L 3.4,7.1 L 8,0.4 L 9.2,0 L 3.3,10.8 Z