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

Jump to bottom

Upgrade AvalonDock.Themes to Version 4.0 #334

Merged
merged 1 commit into from
Aug 22, 2022
Merged

Upgrade AvalonDock.Themes to Version 4.0 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Gemini.Modules.Inspector/Resources/Resources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/Gemini/Framework/Themes/BlueTheme.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Gemini/Framework/Themes/DarkTheme.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Original source code from the Wide framework:
* https://github.com/chandramouleswaran/Wide
*
Expand Down Expand Up @@ -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");
}
}
Expand All @@ -43,4 +43,4 @@ public virtual IEnumerable<Uri> MainWindowResources
get { yield break; }
}
}
}
}
6 changes: 3 additions & 3 deletions src/Gemini/Framework/Themes/LightTheme.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Original source code from the Wide framework:
* https://github.com/chandramouleswaran/Wide
*
Expand Down Expand Up @@ -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");
}
}
Expand All @@ -43,4 +43,4 @@ public virtual IEnumerable<Uri> MainWindowResources
get { yield break; }
}
}
}
}
2 changes: 1 addition & 1 deletion src/Gemini/Gemini.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'" />
Expand Down
6 changes: 3 additions & 3 deletions src/Gemini/Modules/Shell/Controls/LayoutInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down Expand Up @@ -110,4 +110,4 @@ public void AfterInsertDocument(LayoutRoot layout, LayoutDocument anchorableShow

}
}
}
}
6 changes: 3 additions & 3 deletions src/Gemini/Modules/Shell/Views/LayoutUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions src/Gemini/Modules/Shell/Views/ShellView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<UserControl x:Class="Gemini.Modules.Shell.Views.ShellView"
<UserControl x:Class="Gemini.Modules.Shell.Views.ShellView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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"
Expand Down Expand Up @@ -113,4 +113,4 @@
</xcad:LayoutRoot>
</xcad:DockingManager>
</DockPanel>
</UserControl>
</UserControl>
4 changes: 2 additions & 2 deletions src/Gemini/Modules/ToolBars/Views/ToolBarsView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/Gemini/Themes/VS2013/Controls/Menu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down