From c0e770f21b1d46393071f22dce2e4b23d985a2ac Mon Sep 17 00:00:00 2001 From: Maksim Khomutov Date: Wed, 24 Jul 2024 18:23:24 +0800 Subject: [PATCH 01/14] allow to override ShellService.CreateAsync() method --- src/Orchestra.Shell.Shared/Services/ShellService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchestra.Shell.Shared/Services/ShellService.cs b/src/Orchestra.Shell.Shared/Services/ShellService.cs index 4d845ecff..fa11f7231 100644 --- a/src/Orchestra.Shell.Shared/Services/ShellService.cs +++ b/src/Orchestra.Shell.Shared/Services/ShellService.cs @@ -97,7 +97,7 @@ public ShellService(ITypeFactory typeFactory, IKeyboardMappingsService keyboardM /// The created shell. /// The shell is already created and cannot be created again. [Time] - public async Task CreateAsync() + public virtual async Task CreateAsync() where TShell : class, IShell { await _applicationInitializationService.InitializeBeforeShowingSplashScreenAsync(); From 81f1766eddd024a5795201f44494c84e4f134eda Mon Sep 17 00:00:00 2001 From: Maksim Khomutov Date: Wed, 24 Jul 2024 18:42:09 +0800 Subject: [PATCH 02/14] approve API changes --- ...hestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt | 2 +- ..._Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt index 60d1d0b2d..161d7cddc 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt @@ -124,7 +124,7 @@ namespace Orchestra.Services { public ShellService(Catel.IoC.ITypeFactory typeFactory, Orchestra.Services.IKeyboardMappingsService keyboardMappingsService, Catel.MVVM.ICommandManager commandManager, Orchestra.Services.ISplashScreenService splashScreenService, Orchestra.Services.IEnsureStartupService ensureStartupService, Orchestra.Services.IApplicationInitializationService applicationInitializationService, Catel.IoC.IDependencyResolver dependencyResolver, Catel.IoC.IServiceLocator serviceLocator, Orchestra.Services.IConfigurationBackupService configurationBackupService) { } public Orchestra.Views.IShell? Shell { get; } - public System.Threading.Tasks.Task CreateAsync() + public virtual System.Threading.Tasks.Task CreateAsync() where TShell : class, Orchestra.Views.IShell { } } public class XamlResourceService : Orchestra.Services.IXamlResourceService diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt index ced96a073..194c8a27f 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt @@ -305,7 +305,7 @@ namespace Orchestra.Services { public ShellService(Catel.IoC.ITypeFactory typeFactory, Orchestra.Services.IKeyboardMappingsService keyboardMappingsService, Catel.MVVM.ICommandManager commandManager, Orchestra.Services.ISplashScreenService splashScreenService, Orchestra.Services.IEnsureStartupService ensureStartupService, Orchestra.Services.IApplicationInitializationService applicationInitializationService, Catel.IoC.IDependencyResolver dependencyResolver, Catel.IoC.IServiceLocator serviceLocator, Orchestra.Services.IConfigurationBackupService configurationBackupService) { } public Orchestra.Views.IShell? Shell { get; } - public System.Threading.Tasks.Task CreateAsync() + public virtual System.Threading.Tasks.Task CreateAsync() where TShell : class, Orchestra.Views.IShell { } } public class XamlResourceService : Orchestra.Services.IXamlResourceService From 08dd0953ed1cb1f9d4b96c6685c5f434440ea971 Mon Sep 17 00:00:00 2001 From: Margarita Date: Fri, 26 Jul 2024 19:39:32 +0300 Subject: [PATCH 03/14] allow to override ShellService.CreateShellInternalAsync() method --- src/Orchestra.Shell.Shared/Services/ShellService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchestra.Shell.Shared/Services/ShellService.cs b/src/Orchestra.Shell.Shared/Services/ShellService.cs index fa11f7231..1c1bee6a7 100644 --- a/src/Orchestra.Shell.Shared/Services/ShellService.cs +++ b/src/Orchestra.Shell.Shared/Services/ShellService.cs @@ -138,7 +138,7 @@ public virtual async Task CreateAsync() /// The shell created callback. /// The created shell. /// The shell is already created and cannot be created again. - private async Task CreateShellInternalAsync(Action? postShowShellCallback = null) + public virtual async Task CreateShellInternalAsync(Action? postShowShellCallback = null) where TShell : IShell { if (Shell is not null) From f3e09b2c04f2146a1dbf1d1f3122e682455ef969 Mon Sep 17 00:00:00 2001 From: Maksim Khomutov Date: Mon, 29 Jul 2024 10:59:54 +0800 Subject: [PATCH 04/14] approve API changes --- ...hestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt | 2 ++ ..._Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt index 161d7cddc..865c84d01 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt @@ -126,6 +126,8 @@ namespace Orchestra.Services public Orchestra.Views.IShell? Shell { get; } public virtual System.Threading.Tasks.Task CreateAsync() where TShell : class, Orchestra.Views.IShell { } + public virtual System.Threading.Tasks.Task CreateShellInternalAsync(System.Action? postShowShellCallback = null) + where TShell : Orchestra.Views.IShell { } } public class XamlResourceService : Orchestra.Services.IXamlResourceService { diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt index 194c8a27f..15bc57d7b 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt @@ -307,6 +307,8 @@ namespace Orchestra.Services public Orchestra.Views.IShell? Shell { get; } public virtual System.Threading.Tasks.Task CreateAsync() where TShell : class, Orchestra.Views.IShell { } + public virtual System.Threading.Tasks.Task CreateShellInternalAsync(System.Action? postShowShellCallback = null) + where TShell : Orchestra.Views.IShell { } } public class XamlResourceService : Orchestra.Services.IXamlResourceService { From 55db5463126f772a7a85fd265b3895867079aa1f Mon Sep 17 00:00:00 2001 From: Maksim Khomutov Date: Mon, 29 Jul 2024 11:58:15 +0800 Subject: [PATCH 05/14] make CreateShellInternalAsync() private and CreateShellAsync protected --- src/Orchestra.Shell.Shared/Services/ShellService.cs | 4 ++-- ...stra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt | 2 +- ...hell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Orchestra.Shell.Shared/Services/ShellService.cs b/src/Orchestra.Shell.Shared/Services/ShellService.cs index 1c1bee6a7..ba63be605 100644 --- a/src/Orchestra.Shell.Shared/Services/ShellService.cs +++ b/src/Orchestra.Shell.Shared/Services/ShellService.cs @@ -138,7 +138,7 @@ public virtual async Task CreateAsync() /// The shell created callback. /// The created shell. /// The shell is already created and cannot be created again. - public virtual async Task CreateShellInternalAsync(Action? postShowShellCallback = null) + private async Task CreateShellInternalAsync(Action? postShowShellCallback = null) where TShell : IShell { if (Shell is not null) @@ -234,7 +234,7 @@ private async Task InitializeAfterCreatingShellAsync() partial void OnCreatingShell(); [Time] - private async Task CreateShellAsync() + protected virtual async Task CreateShellAsync() where TShell : IShell { Log.Debug("Creating shell using type '{0}'", typeof(TShell).GetSafeFullName(false)); diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt index 865c84d01..b2a9d9f00 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt @@ -126,7 +126,7 @@ namespace Orchestra.Services public Orchestra.Views.IShell? Shell { get; } public virtual System.Threading.Tasks.Task CreateAsync() where TShell : class, Orchestra.Views.IShell { } - public virtual System.Threading.Tasks.Task CreateShellInternalAsync(System.Action? postShowShellCallback = null) + protected virtual System.Threading.Tasks.Task CreateShellAsync() where TShell : Orchestra.Views.IShell { } } public class XamlResourceService : Orchestra.Services.IXamlResourceService diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt index 15bc57d7b..720cc1ae9 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt @@ -307,7 +307,7 @@ namespace Orchestra.Services public Orchestra.Views.IShell? Shell { get; } public virtual System.Threading.Tasks.Task CreateAsync() where TShell : class, Orchestra.Views.IShell { } - public virtual System.Threading.Tasks.Task CreateShellInternalAsync(System.Action? postShowShellCallback = null) + protected virtual System.Threading.Tasks.Task CreateShellAsync() where TShell : Orchestra.Views.IShell { } } public class XamlResourceService : Orchestra.Services.IXamlResourceService From 57bc2acdeb92206126de7120c771db95f8b1f460 Mon Sep 17 00:00:00 2001 From: Maksim Khomutov Date: Mon, 29 Jul 2024 12:45:50 +0800 Subject: [PATCH 06/14] make ShowShell() method protected virtual --- src/Orchestra.Shell.Shared/Services/ShellService.cs | 2 +- ...hestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchestra.Shell.Shared/Services/ShellService.cs b/src/Orchestra.Shell.Shared/Services/ShellService.cs index ba63be605..23744c714 100644 --- a/src/Orchestra.Shell.Shared/Services/ShellService.cs +++ b/src/Orchestra.Shell.Shared/Services/ShellService.cs @@ -281,7 +281,7 @@ protected virtual async Task CreateShellAsync() partial void OnCreatedShell(); [Time] - private void ShowShell(IShell shell) + protected virtual void ShowShell(IShell shell) { if (!_applicationInitializationService.ShowShell) { diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt index b2a9d9f00..29a176195 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_MahApps_HasNoBreakingChanges_Async.verified.txt @@ -128,6 +128,7 @@ namespace Orchestra.Services where TShell : class, Orchestra.Views.IShell { } protected virtual System.Threading.Tasks.Task CreateShellAsync() where TShell : Orchestra.Views.IShell { } + protected virtual void ShowShell(Orchestra.Views.IShell shell) { } } public class XamlResourceService : Orchestra.Services.IXamlResourceService { From 6c2c8a030cb5928c870926753d1a6765480f0554 Mon Sep 17 00:00:00 2001 From: Maksim Khomutov Date: Mon, 29 Jul 2024 12:46:35 +0800 Subject: [PATCH 07/14] approve API changes --- ...a_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt index 720cc1ae9..4b7a2f973 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt @@ -309,6 +309,7 @@ namespace Orchestra.Services where TShell : class, Orchestra.Views.IShell { } protected virtual System.Threading.Tasks.Task CreateShellAsync() where TShell : Orchestra.Views.IShell { } + protected virtual void ShowShell(Orchestra.Views.IShell shell) { } } public class XamlResourceService : Orchestra.Services.IXamlResourceService { From 8d49686a3d19de196c68eac2cc8aefdd89b2e2fa Mon Sep 17 00:00:00 2001 From: Vladimir Date: Tue, 15 Oct 2024 14:37:45 +0300 Subject: [PATCH 08/14] add ribbontogglebutton to automation --- src/Orchestra.Core/Orchestra.Core.csproj | 4 ++-- .../RibbonToggleButton/RibbonButton.cs | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/Orchestra.Shell.Ribbon.Fluent/Automation/FluentRibbon/RibbonToggleButton/RibbonButton.cs diff --git a/src/Orchestra.Core/Orchestra.Core.csproj b/src/Orchestra.Core/Orchestra.Core.csproj index f4716e769..52072e647 100644 --- a/src/Orchestra.Core/Orchestra.Core.csproj +++ b/src/Orchestra.Core/Orchestra.Core.csproj @@ -34,8 +34,8 @@ - - + + diff --git a/src/Orchestra.Shell.Ribbon.Fluent/Automation/FluentRibbon/RibbonToggleButton/RibbonButton.cs b/src/Orchestra.Shell.Ribbon.Fluent/Automation/FluentRibbon/RibbonToggleButton/RibbonButton.cs new file mode 100644 index 000000000..3520c9b8a --- /dev/null +++ b/src/Orchestra.Shell.Ribbon.Fluent/Automation/FluentRibbon/RibbonToggleButton/RibbonButton.cs @@ -0,0 +1,22 @@ +namespace Orchestra.Automation.FluentRibbon; + +using System.Windows.Automation; +using Orc.Automation; +using Orc.Automation.Controls; + +[Control(ClassName = "RibbonToggleButton")] +public class RibbonToggleButton(AutomationElement element) + : FrameworkElement(element) +{ + public string? Content => Element.Current.Name; + public bool? IsChecked + { + get => Element.GetToggleState(); + set => Element.TrySetToggleState(value); + } + + public bool Click() + { + return Element.TryInvoke(); + } +} From 10a7feb27636710153e59c604aff4e8246e836f5 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Tue, 15 Oct 2024 14:39:24 +0300 Subject: [PATCH 09/14] approve --- ..._Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt index 4b7a2f973..7bbc4033e 100644 --- a/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orchestra.Tests/PublicApiFacts.Orchestra_Shell_Ribbon_Fluent_HasNoBreakingChanges_Async.verified.txt @@ -189,6 +189,14 @@ namespace Orchestra.Automation.FluentRibbon public Orchestra.Automation.FluentRibbon.Backstage? Backstage { get; } public System.Collections.Generic.List TabItems { get; } } + [Orc.Automation.Control(ClassName="RibbonToggleButton")] + public class RibbonToggleButton : Orc.Automation.Controls.FrameworkElement + { + public RibbonToggleButton(System.Windows.Automation.AutomationElement element) { } + public string? Content { get; } + public bool? IsChecked { get; set; } + public bool Click() { } + } [Orc.Automation.Control(ClassName="SplitButton")] public class SplitButton : Orc.Automation.Controls.FrameworkElement { From 85a4870585bee77da1c1c7c5fde5df619882ea4e Mon Sep 17 00:00:00 2001 From: Vladimir Date: Tue, 15 Oct 2024 18:46:45 +0300 Subject: [PATCH 10/14] update orc.automation --- src/Orchestra.Core/Orchestra.Core.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchestra.Core/Orchestra.Core.csproj b/src/Orchestra.Core/Orchestra.Core.csproj index 52072e647..6eebf942c 100644 --- a/src/Orchestra.Core/Orchestra.Core.csproj +++ b/src/Orchestra.Core/Orchestra.Core.csproj @@ -34,6 +34,7 @@ + From 2b3d6538a98eb3f7c632148c4517902377d4ee96 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Thu, 17 Oct 2024 10:46:55 +0200 Subject: [PATCH 11/14] Don't attach DotNetPatchHelper in design mode --- src/Orchestra.Core/Helpers/DotNetPatchHelper.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Orchestra.Core/Helpers/DotNetPatchHelper.cs b/src/Orchestra.Core/Helpers/DotNetPatchHelper.cs index 613c92a4d..2a8537314 100644 --- a/src/Orchestra.Core/Helpers/DotNetPatchHelper.cs +++ b/src/Orchestra.Core/Helpers/DotNetPatchHelper.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Threading; + using Catel; using Catel.Logging; /// @@ -28,6 +29,11 @@ public static class DotNetPatchHelper /// public static void Initialize() { + if (CatelEnvironment.IsInDesignMode) + { + return; + } + Attach(); } @@ -45,6 +51,11 @@ public static void Detach() private static void AttachToAppDomain() { + if (CatelEnvironment.IsInDesignMode) + { + return; + } + if (_isAppDomainInitialized) { return; @@ -77,6 +88,11 @@ private static void DetachFromAppDomain() private static void AttachToApplication() { + if (CatelEnvironment.IsInDesignMode) + { + return; + } + if (_isApplicationInitialized) { return; From 808f065c7c570b6185727f853a4649f94a106ba4 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Thu, 17 Oct 2024 12:35:56 +0200 Subject: [PATCH 12/14] Update stable versions --- src/Orchestra.Core/Orchestra.Core.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Orchestra.Core/Orchestra.Core.csproj b/src/Orchestra.Core/Orchestra.Core.csproj index 6eebf942c..c4345be34 100644 --- a/src/Orchestra.Core/Orchestra.Core.csproj +++ b/src/Orchestra.Core/Orchestra.Core.csproj @@ -34,9 +34,10 @@ - - + + + From 94abcb2f806cc962fc6585144124f573f740d166 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Thu, 17 Oct 2024 12:45:18 +0200 Subject: [PATCH 13/14] Use FontSize markup extension --- .../Changelog/Views/ChangelogView.xaml | 9 +- .../Themes/Orchestra.generic.wpf.xaml | 9 +- .../Tooltips/TextBlockAdorner.cs | 2 +- src/Orchestra.Core/Views/AboutWindow.xaml | 43 +++---- src/Orchestra.Core/Views/SplashScreen.xaml | 111 ++++++++++++------ .../Views/SystemInfoWindow.xaml | 86 +++++++++----- .../Views/ThirdPartyNoticesWindow.xaml | 42 ++++--- .../ApplicationInitializationService.cs | 5 + .../ViewModels/FontSizeSelectorViewModel.cs | 12 ++ .../Views/FontSizeSelectorWindow.xaml | 13 ++ .../Views/FontSizeSelectorWindow.xaml.cs | 10 ++ .../Views/MahAppsAboutView.xaml | 39 ++++-- .../Themes/FluentControls.xaml | 12 +- 13 files changed, 273 insertions(+), 120 deletions(-) create mode 100644 src/Orchestra.Examples.Ribbon.Fluent/ViewModels/FontSizeSelectorViewModel.cs create mode 100644 src/Orchestra.Examples.Ribbon.Fluent/Views/FontSizeSelectorWindow.xaml create mode 100644 src/Orchestra.Examples.Ribbon.Fluent/Views/FontSizeSelectorWindow.xaml.cs diff --git a/src/Orchestra.Core/Changelog/Views/ChangelogView.xaml b/src/Orchestra.Core/Changelog/Views/ChangelogView.xaml index 1a98116d4..17102d059 100644 --- a/src/Orchestra.Core/Changelog/Views/ChangelogView.xaml +++ b/src/Orchestra.Core/Changelog/Views/ChangelogView.xaml @@ -3,7 +3,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:catel="http://schemas.catelproject.com" xmlns:orccontrols="http://schemas.wildgums.com/orc/controls" - xmlns:local="clr-namespace:Orchestra.Changelog"> + xmlns:local="clr-namespace:Orchestra.Changelog" + xmlns:orctheming="http://schemas.wildgums.com/orc/theming"> @@ -32,7 +33,7 @@ TextWrapping="Wrap" Text="{Binding Name}" ToolTip="{Binding Name}" - FontSize="16" + FontSize="{orctheming:FontSize 16}" FontWeight="Bold" VerticalAlignment="Center" /> @@ -67,8 +68,8 @@ Grid.Column="1" TextWrapping="Wrap" Text="{Binding Name}" - ToolTip="{Binding Name}" - FontSize="14" + ToolTip="{Binding Name}" + FontSize="{orctheming:FontSize 14}" FontWeight="Normal" VerticalAlignment="Center" /> diff --git a/src/Orchestra.Core/Themes/Orchestra.generic.wpf.xaml b/src/Orchestra.Core/Themes/Orchestra.generic.wpf.xaml index 9d9b56809..d67548786 100644 --- a/src/Orchestra.Core/Themes/Orchestra.generic.wpf.xaml +++ b/src/Orchestra.Core/Themes/Orchestra.generic.wpf.xaml @@ -1,6 +1,7 @@  + xmlns:catel="http://schemas.catelproject.com" + xmlns:orctheming="http://schemas.wildgums.com/orc/theming"> @@ -172,7 +173,8 @@ diff --git a/src/Orchestra.Core/Tooltips/TextBlockAdorner.cs b/src/Orchestra.Core/Tooltips/TextBlockAdorner.cs index b0632b5b7..b2262902d 100644 --- a/src/Orchestra.Core/Tooltips/TextBlockAdorner.cs +++ b/src/Orchestra.Core/Tooltips/TextBlockAdorner.cs @@ -83,7 +83,7 @@ protected override Size ArrangeOverride(Size finalSize) protected override Visual GetVisualChild(int index) { - Argument.IsNotOutOfRange("index", index, 0, 0); + Argument.IsNotOutOfRange(nameof(index), index, 0, 0); return _tooltip; } diff --git a/src/Orchestra.Core/Views/AboutWindow.xaml b/src/Orchestra.Core/Views/AboutWindow.xaml index e14690430..55cb064bf 100644 --- a/src/Orchestra.Core/Views/AboutWindow.xaml +++ b/src/Orchestra.Core/Views/AboutWindow.xaml @@ -3,7 +3,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:catel="http://schemas.catelproject.com" xmlns:orccontrols="http://schemas.wildgums.com/orc/controls" - xmlns:converters="clr-namespace:Orchestra.Converters" + xmlns:converters="clr-namespace:Orchestra.Converters" + xmlns:orctheming="http://schemas.wildgums.com/orc/theming" ResizeMode="NoResize" WindowStyle="None"> @@ -56,23 +57,23 @@ - - - - @@ -85,8 +86,8 @@ Stretch="Uniform" Visibility="{Binding CompanyLogoUri, Converter={catel:ReferenceToCollapsingVisibilityConverter}}" /> - - - - - - + - - - + @@ -40,32 +60,55 @@ - + - + - - - - + - + diff --git a/src/Orchestra.Core/Views/SystemInfoWindow.xaml b/src/Orchestra.Core/Views/SystemInfoWindow.xaml index 532b9e183..8a9aa9c40 100644 --- a/src/Orchestra.Core/Views/SystemInfoWindow.xaml +++ b/src/Orchestra.Core/Views/SystemInfoWindow.xaml @@ -1,16 +1,16 @@ - @@ -29,39 +29,69 @@ - + - + - - - + + - - + + - - - -