Merge branch 'hotfix/7.0.2'

WildGums · Oct 17, 2024 · 7a53bf2 · 7a53bf2
2 parents 8631242 + bc59b32
commit 7a53bf2
Show file tree

Hide file tree

Showing 26 changed files with 350 additions and 143 deletions.
diff --git 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">
 
     <Grid>
         <Grid.RowDefinitions>
@@ -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/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;
 
     /// <summary>
@@ -28,6 +29,11 @@ public static class DotNetPatchHelper
         /// </summary>
         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;

diff --git a/src/Orchestra.Core/Orchestra.Core.csproj b/src/Orchestra.Core/Orchestra.Core.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all">
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LoadAssembliesOnStartup.Fody" Version="4.6.0" PrivateAssets="all" />
@@ -34,8 +34,10 @@
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="all" />
-    <PackageReference Include="Orc.Controls" Version="5.0.3" />
-    <PackageReference Include="Orc.SystemInfo" Version="5.0.0" />
+    <PackageReference Include="Orc.Automation" Version="5.0.5" />
+    <PackageReference Include="Orc.Controls" Version="5.0.7" />
+    <PackageReference Include="Orc.SystemInfo" Version="5.0.1" />
+    <PackageReference Include="Orc.Theming" Version="5.1.1" />
   </ItemGroup>
 
   <Import Project="$(MSBuildProjectDirectory)\..\Directory.Build.nullable.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.Build.nullable.props')" />

diff --git a/src/Orchestra.Core/Themes/Orchestra.generic.wpf.xaml b/src/Orchestra.Core/Themes/Orchestra.generic.wpf.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:catel="http://schemas.catelproject.com">
+                    xmlns:catel="http://schemas.catelproject.com"
+                    xmlns:orctheming="http://schemas.wildgums.com/orc/theming">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Orc.Theming;component/Themes/Generic.xaml" />
@@ -172,7 +173,8 @@
 
     <!-- TextBlock -->
     <Style x:Key="CaptionTextBlockStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlockStyle}">
-        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontSize"
+                Value="{orctheming:FontSize 14}" />
     </Style>
 
     <Style x:Key="RightAlignedTextBlockStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlockStyle}">
@@ -184,7 +186,8 @@
     </Style>
 
     <Style x:Key="HeadingTextBlockStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlockStyle}">
-        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontSize"
+                Value="{orctheming:FontSize 14}" />
         <Setter Property="FontWeight" Value="Bold" />
     </Style>
 

diff --git 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
@@ -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 @@
             </Image.ContextMenu>
         </Image>
 
-        <TextBlock Grid.Row="2"
-                   FontSize="19"
+        <TextBlock Grid.Row="2"
+                   FontSize="{orctheming:FontSize 19}"
                    FontWeight="Medium"
                    HorizontalAlignment="Center"
                    Margin="0 0 0 10"
                    Text="{Binding Title}" />
-        <TextBlock Grid.Row="3"
-                   FontSize="13"
+        <TextBlock Grid.Row="3"
+                   FontSize="{orctheming:FontSize 13}"
                    HorizontalAlignment="Center"
                    Text="{catel:LanguageBinding Orchestra_ReleasedOn}"
                    Visibility="Collapsed" />
-        <TextBlock Grid.Row="4"
-                   FontSize="13"
+        <TextBlock Grid.Row="4"
+                   FontSize="{orctheming:FontSize 13}"
                    HorizontalAlignment="Center"
                    Text="{Binding Version}" />
-        <TextBlock Grid.Row="5"
-                   FontSize="13"
+        <TextBlock Grid.Row="5"
+                   FontSize="{orctheming:FontSize 13}"
                    HorizontalAlignment="Center"
                    Text="{Binding BuildDateTime}" />
 
@@ -85,8 +86,8 @@
                Stretch="Uniform"
                Visibility="{Binding CompanyLogoUri, Converter={catel:ReferenceToCollapsingVisibilityConverter}}" />
 
-        <orccontrols:LinkLabel Grid.Row="7"
-                               FontSize="13"
+        <orccontrols:LinkLabel Grid.Row="7"
+                               FontSize="{orctheming:FontSize 13}"
                                HorizontalAlignment="Center"
                                LinkLabelBehavior="AlwaysUnderline"
                                Url="{Binding UriInfo.Uri}"
@@ -95,14 +96,14 @@
                                Margin="0"
                                Visibility="{Binding UriInfo, Converter={catel:ReferenceToCollapsingVisibilityConverter}}" />
 
-        <TextBlock Grid.Row="8"
-                   FontSize="13"
+        <TextBlock Grid.Row="8"
+                   FontSize="{orctheming:FontSize 13}"
                    HorizontalAlignment="Center"
                    Text="{Binding Copyright}"
                    Visibility="{Binding CopyrightUrl, Converter={catel:BooleanToCollapsingVisibilityConverter Link={catel:BooleanToOppositeBooleanConverter Link={catel:ReferenceToBooleanConverter}}}}" />
 
-        <orccontrols:LinkLabel Grid.Row="8"
-                               FontSize="13"
+        <orccontrols:LinkLabel Grid.Row="8"
+                               FontSize="{orctheming:FontSize 13}"
                                HorizontalAlignment="Center"
                                LinkLabelBehavior="AlwaysUnderline"
                                Url="{Binding CopyrightUrl}"
@@ -111,21 +112,21 @@
                                Margin="0"
                                Visibility="{Binding CopyrightUrl, Converter={catel:ReferenceToCollapsingVisibilityConverter}}" />
 
-        <orccontrols:LinkLabel Grid.Row="9"
-                               FontSize="13"
+        <orccontrols:LinkLabel Grid.Row="9"
+                               FontSize="{orctheming:FontSize 13}"
                                HorizontalAlignment="Center"
                                LinkLabelBehavior="AlwaysUnderline"
                                Command="{Binding ShowThirdPartyNotices}"
                                Content="{catel:LanguageBinding Orchestra_ThirdPartyNotices}"
                                Margin="0" />
 
-        <TextBlock Grid.Row="10"
-                   FontSize="13"
+        <TextBlock Grid.Row="10"
+                   FontSize="{orctheming:FontSize 13}"
                    HorizontalAlignment="Center"
                    Text="{catel:LanguageBinding Orchestra_AllRightsReserved}" />
 
-        <TextBlock Grid.Row="11"
-                   FontSize="13"
+        <TextBlock Grid.Row="11"
+                   FontSize="{orctheming:FontSize 13}"
                    HorizontalAlignment="Center"
                    Margin="0 15 0 0"
                    Text="{catel:LanguageBinding Orchestra_DebugLoggingIsEnabled}"

diff --git a/src/Orchestra.Core/Views/SplashScreen.xaml b/src/Orchestra.Core/Views/SplashScreen.xaml
@@ -1,33 +1,53 @@
-<catel:DataWindow x:Class="Orchestra.Views.SplashScreen"
-                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:catel="http://schemas.catelproject.com"
-                  xmlns:orccontrols="clr-namespace:Orc.Controls;assembly=Orc.Controls"
-                  xmlns:converters="clr-namespace:Orchestra.Converters"
-                  WindowStartupLocation="CenterScreen" WindowStyle="None" SnapsToDevicePixels="True"
-                  SizeToContent="WidthAndHeight" Background="{x:Null}" ResizeMode="NoResize" AllowsTransparency="True"
-                  ShowInTaskbar="True" Margin="0" UseLayoutRounding="True">
+<catel:DataWindow x:Class="Orchestra.Views.SplashScreen"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:catel="http://schemas.catelproject.com"
+                  xmlns:orccontrols="clr-namespace:Orc.Controls;assembly=Orc.Controls"
+                  xmlns:converters="clr-namespace:Orchestra.Converters"
+                  xmlns:orctheming="http://schemas.wildgums.com/orc/theming"
+                  WindowStartupLocation="CenterScreen"
+                  WindowStyle="None"
+                  SnapsToDevicePixels="True"
+                  SizeToContent="WidthAndHeight"
+                  Background="{x:Null}"
+                  ResizeMode="NoResize"
+                  AllowsTransparency="True"
+                  ShowInTaskbar="True"
+                  Margin="0"
+                  UseLayoutRounding="True">
 
     <Window.Resources>
         <!--
             Style overrides to prevent flickering when Catel.Extensions.Controls and style forwarders are
             used, do not remove (even when not used)
         -->
-        <Style x:Key="WindowGridStyle" TargetType="{x:Type Grid}">
-            <Setter Property="Margin" Value="6" />
+        <Style x:Key="WindowGridStyle"
+               TargetType="{x:Type Grid}">
+            <Setter Property="Margin"
+                    Value="6" />
         </Style>
 
-        <Style x:Key="SplashTextBlockStyle" TargetType="TextBlock">
-            <Setter Property="VerticalAlignment" Value="Bottom" />
-            <Setter Property="FontWeight" Value="Light" />
-            <Setter Property="Opacity" Value="0.8" />
-            <Setter Property="Margin" Value="8" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Foreground" Value="White" />
+        <Style x:Key="SplashTextBlockStyle"
+               TargetType="TextBlock">
+            <Setter Property="VerticalAlignment"
+                    Value="Bottom" />
+            <Setter Property="FontWeight"
+                    Value="Light" />
+            <Setter Property="Opacity"
+                    Value="0.8" />
+            <Setter Property="Margin"
+                    Value="8" />
+            <Setter Property="Padding"
+                    Value="0" />
+            <Setter Property="Foreground"
+                    Value="White" />
         </Style>
     </Window.Resources>
 
-    <Grid MinWidth="390" MaxWidth="450" Height="230" Margin="-3">
+    <Grid MinWidth="390"
+          MaxWidth="450"
+          Height="230"
+          Margin="-3">
         <Grid.RowDefinitions>
             <RowDefinition Height="35" />
             <RowDefinition Height="*" />
@@ -40,32 +60,55 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <Border Grid.RowSpan="4" Grid.ColumnSpan="2" BorderThickness="4" Margin="-3" >
+        <Border Grid.RowSpan="4"
+                Grid.ColumnSpan="2"
+                BorderThickness="4"
+                Margin="-3">
             <Border.BorderBrush>
-                <SolidColorBrush Color="#FFFFFF" Opacity="0.2"/>
+                <SolidColorBrush Color="#FFFFFF"
+                                 Opacity="0.2" />
             </Border.BorderBrush>
         </Border>
 
-        <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Text="{Binding Title}" HorizontalAlignment="Center"
-                   VerticalAlignment="Center" TextAlignment="Center" FontSize="36" TextWrapping="Wrap" Margin="70 0 70 0"
+        <TextBlock Grid.Row="1"
+                   Grid.ColumnSpan="2"
+                   Text="{Binding Title}"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   TextAlignment="Center"
+                   FontSize="{orctheming:FontSize 36}"
+                   TextWrapping="Wrap"
+                   Margin="70 0 70 0"
                    Style="{StaticResource SplashTextBlockStyle}" />
 
-        <orccontrols:BusyIndicator Grid.Row="2" Grid.ColumnSpan="2" 
-                                   Foreground="White" Margin="8" 
+        <orccontrols:BusyIndicator Grid.Row="2"
+                                   Grid.ColumnSpan="2"
+                                   Foreground="White"
+                                   Margin="8"
                                    IgnoreUnloadedEventCount="0" />
 
-        <TextBlock Grid.Row="3" Grid.Column="0" Text="{Binding ProducedBy}"
-                   HorizontalAlignment="Left" Style="{StaticResource SplashTextBlockStyle}"
+        <TextBlock Grid.Row="3"
+                   Grid.Column="0"
+                   Text="{Binding ProducedBy}"
+                   HorizontalAlignment="Left"
+                   Style="{StaticResource SplashTextBlockStyle}"
                    Visibility="{Binding CompanyLogoForSplashScreenUri, Converter={catel:ReferenceToCollapsingVisibilityConverter}, ConverterParameter=True}" />
 
-        <Image Grid.Row="3" Grid.Column="0" 
-               Source="{Binding CompanyLogoForSplashScreenUri, Converter={converters:NullImageSourceConverter}}" 
-               HorizontalAlignment="Left"
-               Margin="10" VerticalAlignment="Bottom" Stretch="Uniform" Opacity="0.7"
-               Visibility="{Binding CompanyLogoForSplashScreenUri, Converter={catel:ReferenceToCollapsingVisibilityConverter}}"/>
+        <Image Grid.Row="3"
+               Grid.Column="0"
+               Source="{Binding CompanyLogoForSplashScreenUri, Converter={converters:NullImageSourceConverter}}"
+               HorizontalAlignment="Left"
+               Margin="10"
+               VerticalAlignment="Bottom"
+               Stretch="Uniform"
+               Opacity="0.7"
+               Visibility="{Binding CompanyLogoForSplashScreenUri, Converter={catel:ReferenceToCollapsingVisibilityConverter}}" />
 
-        <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Version, StringFormat= v{0}}"
-                   HorizontalAlignment="Right" Style="{StaticResource SplashTextBlockStyle}" />
+        <TextBlock Grid.Row="3"
+                   Grid.Column="1"
+                   Text="{Binding Version, StringFormat= v{0}}"
+                   HorizontalAlignment="Right"
+                   Style="{StaticResource SplashTextBlockStyle}" />
     </Grid>
 
 </catel:DataWindow>