From 54eb75f9bc86ee38929776615e30d213104777f1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 22 Aug 2025 20:13:48 +0800
Subject: [PATCH 01/17] Add iNKORE.UI.WPF.Modern package

---
 Application/FileConverter/FileConverter.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj
index 70979b37..fb5175ed 100644
--- a/Application/FileConverter/FileConverter.csproj
+++ b/Application/FileConverter/FileConverter.csproj
@@ -386,6 +386,9 @@
     <PackageReference Include="CommunityToolkit.Mvvm">
       <Version>8.4.0</Version>
     </PackageReference>
+    <PackageReference Include="iNKORE.UI.WPF.Modern">
+      <Version>0.10.1</Version>
+    </PackageReference>
     <PackageReference Include="Magick.NET-Q16-AnyCPU">
       <Version>14.4.0</Version>
     </PackageReference>
@@ -401,9 +404,6 @@
     <PackageReference Include="Microsoft.Office.Interop.Word">
       <Version>15.0.4797.1003</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
-      <Version>1.1.135</Version>
-    </PackageReference>
     <PackageReference Include="Office">
       <Version>12.0.0</Version>
     </PackageReference>

From 04c8fccdc4298e15193758fb2b2f4e5d470170a2 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 22 Aug 2025 20:14:07 +0800
Subject: [PATCH 02/17] Add iNKORE.UI.WPF.Modern resources

---
 Application/FileConverter/Application.xaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Application/FileConverter/Application.xaml b/Application/FileConverter/Application.xaml
index 41d9604f..f9739dc5 100644
--- a/Application/FileConverter/Application.xaml
+++ b/Application/FileConverter/Application.xaml
@@ -7,10 +7,14 @@
              xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
              xmlns:viewModels="clr-namespace:FileConverter.ViewModels"
              xmlns:services="clr-namespace:FileConverter.Services"
+             xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
              ShutdownMode="OnLastWindowClose">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ui:ThemeResources />
+                <ui:XamlControlsResources />
                 <ResourceDictionary Source="Views/Resources/Colors.xaml"/>
                 <ResourceDictionary Source="Views/Resources/CustomStyles.xaml"/>
             </ResourceDictionary.MergedDictionaries>

From a328fde1875f6f7ebd3bc9f4b56d850fb8ecfec1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 22 Aug 2025 21:09:15 +0800
Subject: [PATCH 03/17] Add dark mode support for different windows

---
 .../FileConverter/Views/DiagnosticsWindow.xaml      | 10 +++++++++-
 Application/FileConverter/Views/HelpWindow.xaml     | 13 +++++++++++--
 Application/FileConverter/Views/MainWindow.xaml     | 10 +++++++++-
 Application/FileConverter/Views/SettingsWindow.xaml | 13 +++++++++++--
 Application/FileConverter/Views/UpgradeWindow.xaml  | 10 +++++++++-
 5 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/Application/FileConverter/Views/DiagnosticsWindow.xaml b/Application/FileConverter/Views/DiagnosticsWindow.xaml
index d0eb5eba..a8662b7d 100644
--- a/Application/FileConverter/Views/DiagnosticsWindow.xaml
+++ b/Application/FileConverter/Views/DiagnosticsWindow.xaml
@@ -7,6 +7,14 @@
         xmlns:project="clr-namespace:FileConverter.Properties"
         xmlns:local="clr-namespace:FileConverter"
         xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:ThemeManager.RequestedTheme="Default"
+        ui:TitleBar.ExtendViewIntoTitleBar="False"
+        ui:TitleBar.Height="48"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
         mc:Ignorable="d"
         Height="600" Width="800" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
         DataContext="{Binding Diagnostics, Source={StaticResource Locator}}">
@@ -18,7 +26,7 @@
     <Window.Title>
         <Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
     </Window.Title>
-    <Grid>
+    <Grid Margin="10 0 10 10">
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
             <RowDefinition Height="*" />
diff --git a/Application/FileConverter/Views/HelpWindow.xaml b/Application/FileConverter/Views/HelpWindow.xaml
index 1e17913b..5ae9ddab 100644
--- a/Application/FileConverter/Views/HelpWindow.xaml
+++ b/Application/FileConverter/Views/HelpWindow.xaml
@@ -7,6 +7,15 @@
         xmlns:project="clr-namespace:FileConverter.Properties"
         xmlns:gif="http://wpfanimatedgif.codeplex.com"
         xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:ThemeManager.RequestedTheme="Default"
+        ui:TitleBar.ExtendViewIntoTitleBar="False"
+        ui:TitleBar.Height="48"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        SizeToContent="Height"
         mc:Ignorable="d" Icon="/FileConverter;component/Resources/ApplicationIcon.ico" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="NoResize" 
         Width="1000" Height="880"
         DataContext="{Binding Help, Source={StaticResource Locator}}">
@@ -20,13 +29,13 @@
     <Window.Title>
         <Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(fileConverter:Application.ApplicationVersion)"/>
     </Window.Title>
-    <StackPanel Margin="5" VerticalAlignment="Center">
+    <StackPanel Margin="10 0 10 10" VerticalAlignment="Center">
         <TextBlock Margin="0,0,0,4"  Text="{x:Static project:Resources.FileConverterStartHelp1}" TextWrapping="Wrap" FontWeight="Bold" FontSize="13.333"/>
         <TextBlock Text="{x:Static project:Resources.FileConverterStartHelp2}" TextWrapping="Wrap"/>
         <TextBlock Text="{x:Static project:Resources.FileConverterStartHelp3}" TextWrapping="Wrap" />
         <Image Margin="0,7,0,7" HorizontalAlignment="Left" Height="Auto" VerticalAlignment="Top" Width="Auto" 
                gif:ImageBehavior.AnimatedSource="/FileConverter;component/Resources/FileConverterUsage.gif"
                Stretch="Fill"/>
-        <Button Content="{x:Static project:Resources.Ok}" Height="28" Command="{Binding CloseCommand}"/>
+        <Button HorizontalAlignment="Stretch" Content="{x:Static project:Resources.Ok}" Command="{Binding CloseCommand}"/>
     </StackPanel>
 </Window>
diff --git a/Application/FileConverter/Views/MainWindow.xaml b/Application/FileConverter/Views/MainWindow.xaml
index a8419662..f65ca265 100644
--- a/Application/FileConverter/Views/MainWindow.xaml
+++ b/Application/FileConverter/Views/MainWindow.xaml
@@ -7,6 +7,14 @@
         xmlns:project="clr-namespace:FileConverter.Properties"
         xmlns:controls="clr-namespace:FileConverter.Controls"
         xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:ThemeManager.RequestedTheme="Default"
+        ui:TitleBar.ExtendViewIntoTitleBar="False"
+        ui:TitleBar.Height="48"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
         mc:Ignorable="d" x:Class="FileConverter.Views.MainWindow"
         Height="500" Width="950" MinHeight="480" MinWidth="640" WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
         DataContext="{Binding Main, Source={StaticResource Locator}}">
@@ -28,7 +36,7 @@
             ProgressValue="{Binding ConversionJobs, Converter={StaticResource ConversionJobsToProgressValue}}" />
     </Window.TaskbarItemInfo>
 
-    <Grid Margin="10">
+    <Grid Margin="10 0 10 10">
         <Grid.RowDefinitions>
             <RowDefinition Height="64" />
             <RowDefinition Height="*" />
diff --git a/Application/FileConverter/Views/SettingsWindow.xaml b/Application/FileConverter/Views/SettingsWindow.xaml
index e7ede278..63bd80a8 100644
--- a/Application/FileConverter/Views/SettingsWindow.xaml
+++ b/Application/FileConverter/Views/SettingsWindow.xaml
@@ -9,6 +9,14 @@
         xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
         xmlns:controls="clr-namespace:FileConverter.Controls"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:ThemeManager.RequestedTheme="Default"
+        ui:TitleBar.ExtendViewIntoTitleBar="False"
+        ui:TitleBar.Height="48"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
         x:Class="FileConverter.Views.SettingsWindow"
         MinWidth="800" MinHeight="600" 
         Width="1050" Height="700"
@@ -209,11 +217,11 @@
         <Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
     </Window.Title>
 
-    <Grid Margin="10">
+    <Grid Margin="10 0 10 10">
         <Grid.RowDefinitions>
             <RowDefinition Height="53"/>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="30"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <!-- Header -->
@@ -281,6 +289,7 @@
                                     </Style.Resources>
 
                                     <Setter Property="IsExpanded" Value="True"/>
+                                    <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
 
                                     <EventSetter Event="PreviewMouseLeftButtonDown"  Handler="TreeView_MouseDown"/>
                                     <EventSetter Event="MouseUp"  Handler="TreeView_MouseUp"/>
diff --git a/Application/FileConverter/Views/UpgradeWindow.xaml b/Application/FileConverter/Views/UpgradeWindow.xaml
index 7b47a805..32f597df 100644
--- a/Application/FileConverter/Views/UpgradeWindow.xaml
+++ b/Application/FileConverter/Views/UpgradeWindow.xaml
@@ -5,6 +5,14 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:project="clr-namespace:FileConverter.Properties"
         xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:ThemeManager.RequestedTheme="Default"
+        ui:TitleBar.ExtendViewIntoTitleBar="False"
+        ui:TitleBar.Height="48"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
         mc:Ignorable="d"
         Title="{x:Static project:Resources.UpgradeWindowTitle}"
         WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
@@ -18,7 +26,7 @@
     </behaviors:Interaction.Triggers>
     <Window.Resources>
     </Window.Resources>
-    <Grid>
+    <Grid Margin="10 0 10 10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>

From f68403c2e1f5e7d94bb64bbda51a958b32d52e57 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 22 Aug 2025 21:09:39 +0800
Subject: [PATCH 04/17] Comment out unused resources

---
 .../FileConverter/Views/Resources/CustomStyles.xaml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Application/FileConverter/Views/Resources/CustomStyles.xaml b/Application/FileConverter/Views/Resources/CustomStyles.xaml
index d1d705c8..6f2b8f4b 100644
--- a/Application/FileConverter/Views/Resources/CustomStyles.xaml
+++ b/Application/FileConverter/Views/Resources/CustomStyles.xaml
@@ -12,7 +12,7 @@
 
     <!-- Data validation styles -->
 
-    <Style TargetType="{x:Type TextBox}">
+    <!--<Style TargetType="{x:Type TextBox}">
         <Setter Property="Validation.ErrorTemplate">
             <Setter.Value>
                 <ControlTemplate>
@@ -28,11 +28,11 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-    </Style>
+    </Style>-->
 
     <!-- Button -->
 
-    <Style TargetType="{x:Type Button}">
+    <!--<Style TargetType="{x:Type Button}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
@@ -62,7 +62,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-    </Style>
+    </Style>-->
 
     <Style x:Key="TileButton" TargetType="{x:Type Button}">
         <Setter Property="Template">
@@ -167,9 +167,9 @@
         <Setter Property="BorderBrush" Value="{DynamicResource TreeView_BorderBrush}" />
     </Style>
 
-    <Style TargetType="{x:Type Window}">
+    <!--<Style TargetType="{x:Type Window}">
         <Setter Property="Background" Value="{DynamicResource Window_BackgroundBrush}" />
-    </Style>
+    </Style>-->
 
 </ResourceDictionary>
     
\ No newline at end of file

From a3a2560713e7dacd9289213e146dfeb41ba20205 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 22 Aug 2025 21:10:18 +0800
Subject: [PATCH 05/17] Improve TabControl & TabItem & TreeView & Hyperlink
 under dark mode

---
 .../FileConverter/Views/Resources/CustomStyles.xaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Application/FileConverter/Views/Resources/CustomStyles.xaml b/Application/FileConverter/Views/Resources/CustomStyles.xaml
index 6f2b8f4b..c8d74b68 100644
--- a/Application/FileConverter/Views/Resources/CustomStyles.xaml
+++ b/Application/FileConverter/Views/Resources/CustomStyles.xaml
@@ -97,7 +97,7 @@
     </Style>
 
     <Style TargetType="{x:Type Hyperlink}">
-        <Setter Property="Foreground" Value="{DynamicResource Hyperlink_ForegroundBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource HyperlinkForeground}" />
     </Style>
 
     <Style TargetType="{x:Type controls:IconButton}">
@@ -137,17 +137,18 @@
             <Setter.Value>
                 <ControlTemplate TargetType="TabItem">
                     <Border Name="border" BorderThickness="1,1,1,0" CornerRadius="3,3,0,0"
-                            Background="{DynamicResource TabItem_BackgroundBrush}"
+                            Background="Transparent"
                             BorderBrush="{DynamicResource TabItem_BorderBrush}">
                         <ContentPresenter x:Name="contentSite"  
                             VerticalAlignment="Center"  
                             HorizontalAlignment="Center"  
                             ContentSource="Header"  
-                            Margin="18,4"/>
+                            Margin="18,4"
+                            TextElement.Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource TabItem_IsSelected_BackgroundBrush}" />
+                            <Setter Property="Background" TargetName="border" Value="Transparent" />
                             <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource TabItem_IsSelected_BorderBrush}" />
                             <Setter Property="TextElement.FontWeight" TargetName="contentSite" Value="Bold" />
                         </Trigger>
@@ -158,12 +159,12 @@
     </Style>
 
     <Style TargetType="{x:Type TabControl}">
-        <Setter Property="Background" Value="{DynamicResource TabControl_BackgroundBrush}" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource TabControl_BorderBrush}" />
     </Style>
 
     <Style TargetType="{x:Type TreeView}">
-        <Setter Property="Background" Value="{DynamicResource TreeView_BackgroundBrush}" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource TreeView_BorderBrush}" />
     </Style>
 

From 1de8e3777a09a18f5e19749592d01e3701b9337b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 23 Aug 2025 10:03:28 +0800
Subject: [PATCH 06/17] Improve setting window design

---
 .../EncodingQualitySliderControl.xaml         |   2 +-
 .../Resources/ConversionPresetTemplates.xaml  |  24 +-
 .../FileConverter/Views/SettingsWindow.xaml   | 222 +++++++++---------
 3 files changed, 126 insertions(+), 122 deletions(-)

diff --git a/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml b/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml
index de6684d5..931ca633 100644
--- a/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml
+++ b/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml
@@ -25,6 +25,6 @@
                 AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" Minimum="65" Maximum="245" SelectionStart="115" SelectionEnd="245" SmallChange="8" LargeChange="32" TickPlacement="BottomRight" TickFrequency="8" Ticks="65 85 100 115 130 165 175 190 225 245" 
                 Foreground="{DynamicResource MainDarkBrush}" />
         <Label Grid.Row="0" Grid.Column="1" Content="{Binding Value, Converter={StaticResource BitrateToString}, ElementName=slider, Mode=OneWay}" Width="65" />
-        <Label Grid.Column="0" Grid.Row="1" Content="{x:Static project:Resources.RecommendedBitrateRangeInBlue}" Foreground="{DynamicResource MainDarkBrush}" FontSize="11" />
+        <Label Grid.Column="0" Grid.Row="1" Content="{x:Static project:Resources.RecommendedBitrateRangeInBlue}" Foreground="{DynamicResource HyperlinkForeground}" FontSize="11" />
     </Grid>
 </UserControl>
diff --git a/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml b/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
index 98ddf1e7..4da027a2 100644
--- a/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
+++ b/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
@@ -317,7 +317,7 @@
 
             <DockPanel Grid.Row="0" Grid.Column="0">
                 <Label Content="{x:Static project:Resources.VideoTitle}" FontWeight="Bold" Margin="17,0,0,0"/>
-                <Label Content="(H.264)" FontWeight="Light" Foreground="{DynamicResource MainDarkBrush}" />
+                <Label Content="(H.264)" FontWeight="Light" Foreground="{DynamicResource HyperlinkForeground}" />
             </DockPanel>
 
             <Label Grid.Row="1" Grid.Column="0" Content="{x:Static project:Resources.Quality}" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
@@ -356,20 +356,21 @@
             <!--Rotate-->
             <Label Content="{x:Static project:Resources.Rotate}" Grid.Row="4" Grid.Column="0" HorizontalAlignment="Right"/>
             <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal">
-                <RadioButton Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
+                <RadioButton MinWidth="0" Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
                                  IsChecked="{Binding Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, Mode=TwoWay}"/>
-                <RadioButton Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
+                <RadioButton MinWidth="0" Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
                                  IsChecked="{Binding Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, Mode=TwoWay}"/>
-                <RadioButton Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
+                <RadioButton MinWidth="0" Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
                                  IsChecked="{Binding Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, Mode=TwoWay}"/>
-                <RadioButton Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
+                <RadioButton MinWidth="0" Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
                                  IsChecked="{Binding Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, Mode=TwoWay}"/>
             </StackPanel>
 
             <DockPanel Grid.Row="5" Grid.Column="0">
-                <CheckBox IsChecked="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=TwoWay}" Margin="0,6,0,0" />
-                <Label Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
-                <Label Content="(AAC)" FontWeight="Light" Foreground="{DynamicResource MainDarkBrush}" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
+                <CheckBox
+                    Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"
+                    IsChecked="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=TwoWay}" Margin="0,6,0,0" />
+                <Label Content="(AAC)" FontWeight="Light" Foreground="{DynamicResource HyperlinkForeground}" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
             </DockPanel>
 
             <Label Content="{x:Static project:Resources.Quality}" Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
@@ -666,10 +667,11 @@
     <DataTemplate x:Key="CustomSettingsDataTemplate" DataType="{x:Type fileConverter:ConversionPreset}">
         <StackPanel>
             <DockPanel>
-                <CheckBox Margin="0,6,0,0" 
+                <CheckBox Margin="0,6,0,0"
+                          FontWeight="Bold" 
+                          Content="{x:Static project:Resources.AdvancedMode}"
+                          IsEnabled="{Binding Settings, ConverterParameter=EnableFFMPEGCustomCommand|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"
                           IsChecked="{Binding Settings, ConverterParameter=EnableFFMPEGCustomCommand|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=TwoWay}" />
-                <Label FontWeight="Bold" 
-                       Content="{x:Static project:Resources.AdvancedMode}" IsEnabled="{Binding Settings, ConverterParameter=EnableFFMPEGCustomCommand|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
             </DockPanel>
             <Grid Visibility="{Binding Settings, Converter={StaticResource ConversionSettingsToVisibility}, ConverterParameter=EnableFFMPEGCustomCommand|System.Boolean|Collapsed}">
                 <Grid.ColumnDefinitions>
diff --git a/Application/FileConverter/Views/SettingsWindow.xaml b/Application/FileConverter/Views/SettingsWindow.xaml
index 63bd80a8..ecc3606e 100644
--- a/Application/FileConverter/Views/SettingsWindow.xaml
+++ b/Application/FileConverter/Views/SettingsWindow.xaml
@@ -65,137 +65,139 @@
 
             <DataTemplate x:Key="PresetSelectedTemplate" DataType="{x:Type viewModels:SettingsViewModel}">
                 <GroupBox Header="{x:Static project:Resources.Preset}">
-                    <Grid Margin="5">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="2.5*"/>
-                            <ColumnDefinition Width="*" MaxWidth="240"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="30"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-
-                        <DockPanel Grid.Row="0" Grid.Column="0">
-                            <Label Content="{x:Static project:Resources.PresetName}" Margin="0,0,5,0"/>
-                            <TextBox Margin="5,2,5,2" TextWrapping="Wrap" FontSize="15"
+                    <ui:ScrollViewerEx>
+                        <Grid Margin="5">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="2.5*"/>
+                                <ColumnDefinition Width="*" MaxWidth="240"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+
+                            <DockPanel Grid.Row="0" Grid.Column="0">
+                                <Label Content="{x:Static project:Resources.PresetName}" Margin="0,0,5,0"/>
+                                <TextBox Margin="5,2,5,2" TextWrapping="Wrap" FontSize="15"
                                      Loaded="SelectedPresetName_OnLoaded"
                                      Text="{Binding SelectedPreset.Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
-                        </DockPanel>
+                            </DockPanel>
 
-                        <GroupBox Header="{x:Static project:Resources.OutputFormat}" Grid.Row="1" Grid.Column="0" Margin="5">
-                            <StackPanel>
-                                <ComboBox Margin="5" Height="29" VerticalAlignment="Top" 
+                            <GroupBox Header="{x:Static project:Resources.OutputFormat}" Grid.Row="1" Grid.Column="0" Margin="5">
+                                <StackPanel>
+                                    <ComboBox Margin="5" VerticalAlignment="Top" HorizontalAlignment="Stretch"
                                           ItemsSource="{Binding OutputTypes}"
                                           SelectedItem="{Binding SelectedPreset.Preset.OutputType, Converter={StaticResource OutputTypeEnumToViewModel}, Mode=TwoWay}">
-                                    <ComboBox.GroupStyle>
-                                        <GroupStyle>
-                                            <GroupStyle.HeaderTemplate>
-                                                <DataTemplate>
-                                                    <TextBlock Foreground="{DynamicResource MainDarkBrush}" Background="{DynamicResource MainLighterBrush}" FontWeight="Bold" Padding="5,5,5,5"
+                                        <ComboBox.GroupStyle>
+                                            <GroupStyle>
+                                                <GroupStyle.HeaderTemplate>
+                                                    <DataTemplate>
+                                                        <TextBlock FontWeight="Bold" Padding="5,5,5,5"
                                                                 Text="{Binding Name, Converter={StaticResource ObjectToLocalizedString}}"/>
-                                                </DataTemplate>
-                                            </GroupStyle.HeaderTemplate>
-                                        </GroupStyle>
-                                    </ComboBox.GroupStyle>
-                                    <ComboBox.ItemTemplate>
-                                        <DataTemplate DataType="{x:Type viewModels:OutputTypeViewModel}">
-                                            <TextBlock Text="{Binding Type}" Padding="10,2,2,2"/>
-                                        </DataTemplate>
-                                    </ComboBox.ItemTemplate>
-                                </ComboBox>
-
-                                <ContentControl Content="{Binding SelectedPreset.Preset}"
+                                                    </DataTemplate>
+                                                </GroupStyle.HeaderTemplate>
+                                            </GroupStyle>
+                                        </ComboBox.GroupStyle>
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate DataType="{x:Type viewModels:OutputTypeViewModel}">
+                                                <TextBlock Text="{Binding Type}" Padding="10,2,2,2"/>
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+
+                                    <ContentControl Content="{Binding SelectedPreset.Preset}"
                                                 Style="{StaticResource ConversionSettingsSelectorStyle}">
-                                </ContentControl>
+                                    </ContentControl>
+
+                                    <Separator/>
+
+                                    <!-- Output file name template -->
+                                    <Grid Margin="5">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="2*"/>
+                                        </Grid.ColumnDefinitions>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="23"/>
+                                            <RowDefinition Height="23"/>
+                                            <RowDefinition Height="23"/>
+                                        </Grid.RowDefinitions>
+                                        <Label Content="{x:Static project:Resources.FileNameTemplate}" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,5,0"/>
+                                        <TextBox Grid.Row="0" Grid.Column="1" Margin="5,2,25,2" TextWrapping="Wrap" Width="Auto" 
+                                                 ToolTip="{x:Static project:Resources.OutputFilePathTemplateHelp}"
+                                                 Text="{Binding SelectedPreset.OutputFileNameTemplate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                                        <Label Content="{x:Static project:Resources.InputExample}" Grid.Row="1" Grid.Column="0" HorizontalContentAlignment="Right" Margin="0,0,5,0" Foreground="{DynamicResource LighterForegroundBrush}" FontSize="10"/>
+                                        <TextBlock Text="{x:Static project:Resources.OutputFileNameTemplateSample}" Grid.Row="1" Grid.Column="1" Margin="5,0,5,0" Foreground="{DynamicResource LighterForegroundBrush}" FontSize="10" VerticalAlignment="Center"/>
+                                        <Label Content="{x:Static project:Resources.OutputExample}" Grid.Row="2" Grid.Column="0" HorizontalContentAlignment="Right" Margin="0,0,5,0" Foreground="{DynamicResource LighterForegroundBrush}" FontSize="10"/>
+                                        <TextBlock Grid.Row="2" Grid.Column="1" Margin="5,0,5,0" Foreground="{DynamicResource LighterForegroundBrush}" FontSize="10" VerticalAlignment="Center">
+                                            <TextBlock.Text>
+                                                <MultiBinding Converter="{StaticResource FileNameConverter}">
+                                                    <Binding Source="{x:Static project:Resources.OutputFileNameTemplateSample}"/>
+                                                    <Binding Path="SelectedPreset.Preset.OutputType" Mode="OneWay"/>
+                                                    <Binding Path="SelectedPreset.Preset.OutputFileNameTemplate" Mode="OneWay"/>
+                                                </MultiBinding>
+                                            </TextBlock.Text>
+                                        </TextBlock>
+                                        <TextBlock Grid.Row="3" Grid.Column="1" Margin="5,0,5,0">
+                                            <Hyperlink CommandParameter="https://github.com/Tichau/FileConverter/wiki/Output-file-path-template" Command="{Binding OpenUrlCommand, Mode=OneWay}"><x:Static Member="project:Resources.Help" /></Hyperlink>
+                                        </TextBlock>
+                                    </Grid>
 
-                                <Separator/>
+                                </StackPanel>
+                            </GroupBox>
 
-                                <!-- Output file name template -->
+                            <GroupBox Grid.Row="1" Grid.Column="1" Header="{x:Static project:Resources.InputFormats}" Margin="5">
                                 <Grid Margin="5">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="2*"/>
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="30"/>
-                                        <RowDefinition Height="23"/>
-                                        <RowDefinition Height="23"/>
-                                        <RowDefinition Height="23"/>
+                                        <RowDefinition Height="*"/>
+                                        <RowDefinition Height="25"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="22"/>
                                     </Grid.RowDefinitions>
-                                    <Label Content="{x:Static project:Resources.FileNameTemplate}" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,5,0"/>
-                                    <TextBox Grid.Row="0" Grid.Column="1" Margin="5,2,25,2" TextWrapping="Wrap" Width="Auto" 
-                                                 ToolTip="{x:Static project:Resources.OutputFilePathTemplateHelp}"
-                                                 Text="{Binding SelectedPreset.OutputFileNameTemplate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
-                                    <Label Content="{x:Static project:Resources.InputExample}" Grid.Row="1" Grid.Column="0" HorizontalContentAlignment="Right" Margin="0,0,5,0" Foreground="{DynamicResource LighterForegroundBrush}" FontSize="10"/>
-                                    <TextBlock Text="{x:Static project:Resources.OutputFileNameTemplateSample}" Grid.Row="1" Grid.Column="1" Margin="5,0,5,0" Foreground="{DynamicResource LighterForegroundBrush}" FontSize="10" VerticalAlignment="Center"/>
-                                    <Label Content="{x:Static project:Resources.OutputExample}" Grid.Row="2" Grid.Column="0" HorizontalContentAlignment="Right" Margin="0,0,5,0" Foreground="{DynamicResource LighterForegroundBrush}" FontSize="10"/>
-                                    <TextBlock Grid.Row="2" Grid.Column="1" Margin="5,0,5,0" Foreground="{DynamicResource LighterForegroundBrush}" FontSize="10" VerticalAlignment="Center">
-                                        <TextBlock.Text>
-                                            <MultiBinding Converter="{StaticResource FileNameConverter}">
-                                                <Binding Source="{x:Static project:Resources.OutputFileNameTemplateSample}"/>
-                                                <Binding Path="SelectedPreset.Preset.OutputType" Mode="OneWay"/>
-                                                <Binding Path="SelectedPreset.Preset.OutputFileNameTemplate" Mode="OneWay"/>
-                                            </MultiBinding>
-                                        </TextBlock.Text>
-                                    </TextBlock>
-                                    <TextBlock Grid.Row="3" Grid.Column="1" Margin="5,0,5,0">
-                                            <Hyperlink CommandParameter="https://github.com/Tichau/FileConverter/wiki/Output-file-path-template" Command="{Binding OpenUrlCommand, Mode=OneWay}"><x:Static Member="project:Resources.Help" /></Hyperlink>
-                                    </TextBlock>
-                                </Grid>
 
-                            </StackPanel>
-                        </GroupBox>
-
-                        <GroupBox Grid.Row="1" Grid.Column="1" Header="{x:Static project:Resources.InputFormats}" Margin="5">
-                            <Grid Margin="5">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="25"/>
-                                    <RowDefinition Height="25"/>
-                                    <RowDefinition Height="22"/>
-                                </Grid.RowDefinitions>
-
-                                <TreeView x:Name="InputTypesTreeView" ItemsSource="{Binding InputCategories}" >
-                                    <TreeView.Resources>
-                                        <HierarchicalDataTemplate DataType="{x:Type viewModels:InputExtensionCategory}" ItemsSource="{Binding InputExtensions}">
-                                            <CheckBox Height="20" VerticalAlignment="Top" Margin="2" IsThreeState="True"
+                                    <TreeView x:Name="InputTypesTreeView" ItemsSource="{Binding InputCategories}" ScrollViewer.IsDeferredScrollingEnabled="True">
+                                        <TreeView.Resources>
+                                            <HierarchicalDataTemplate DataType="{x:Type viewModels:InputExtensionCategory}" ItemsSource="{Binding InputExtensions}">
+                                                <CheckBox Height="20" VerticalAlignment="Top" Margin="2" IsThreeState="True"
                                               Content="{Binding Name, Converter={StaticResource ObjectToLocalizedString}}"
                                               IsChecked="{Binding IsChecked, Mode=TwoWay}">
-                                            </CheckBox>
-                                        </HierarchicalDataTemplate>
-                                        <DataTemplate DataType="{x:Type viewModels:InputExtension}">
-                                            <CheckBox Height="20" VerticalAlignment="Top" Margin="2"
-                                              Content="{Binding Name}" Foreground="{Binding ForegroundBrush}" ToolTip="{Binding ToolTip}"
+                                                </CheckBox>
+                                            </HierarchicalDataTemplate>
+                                            <DataTemplate DataType="{x:Type viewModels:InputExtension}">
+                                                <CheckBox Height="20" VerticalAlignment="Top" Margin="2"
+                                              Content="{Binding Name}" ToolTip="{Binding ToolTip}"
                                               IsChecked="{Binding IsChecked, Mode=TwoWay}">
-                                            </CheckBox>
-                                        </DataTemplate>
-                                    </TreeView.Resources>
-                                    <TreeView.ItemContainerStyle>
-                                        <Style TargetType="TreeViewItem">
-                                            <Setter Property="IsExpanded" Value="True"/>
-                                        </Style>
-                                    </TreeView.ItemContainerStyle>
-                                </TreeView>
-
-                                <Label Grid.Row="1" Content="{x:Static project:Resources.ActionWhenConversionSucceedTitle}" ToolTip="{x:Static project:Resources.ActionWhenConversionSucceedDescription}" />
-                                <ComboBox Grid.Row="2" ItemsSource="{Binding InputPostConversionActions, Mode=OneTime}"
+                                                </CheckBox>
+                                            </DataTemplate>
+                                        </TreeView.Resources>
+                                        <TreeView.ItemContainerStyle>
+                                            <Style TargetType="TreeViewItem">
+                                                <Setter Property="IsExpanded" Value="True"/>
+                                            </Style>
+                                        </TreeView.ItemContainerStyle>
+                                    </TreeView>
+
+                                    <Label Grid.Row="1" Content="{x:Static project:Resources.ActionWhenConversionSucceedTitle}" ToolTip="{x:Static project:Resources.ActionWhenConversionSucceedDescription}" />
+                                    <ComboBox Grid.Row="2" ItemsSource="{Binding InputPostConversionActions, Mode=OneTime}"
                                               SelectedItem="{Binding SelectedPreset.Preset.InputPostConversionAction, Mode=TwoWay}">
-                                    <ComboBox.ItemTemplate>
-                                        <DataTemplate>
-                                            <ContentPresenter Content="{Binding Converter={StaticResource ObjectToLocalizedString}}" />
-                                        </DataTemplate>
-                                    </ComboBox.ItemTemplate>
-                                </ComboBox>
-
-                                <TextBlock Grid.Row="3" Margin="0,5,0,0">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <ContentPresenter Content="{Binding Converter={StaticResource ObjectToLocalizedString}}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+
+                                    <TextBlock Grid.Row="3" Margin="0,5,0,0">
                                         <Hyperlink CommandParameter="https://github.com/Tichau/FileConverter/wiki/Input-file-post-conversion-actions" Command="{Binding OpenUrlCommand, Mode=OneWay}"><x:Static Member="project:Resources.Help" /></Hyperlink>
-                                </TextBlock>
-                            </Grid>
-                        </GroupBox>
-                    </Grid>
+                                    </TextBlock>
+                                </Grid>
+                            </GroupBox>
+                        </Grid>
+                    </ui:ScrollViewerEx>
                 </GroupBox>
             </DataTemplate>
 

From c31ae79064324df9f3ab57264a4bb86a8441dca7 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 23 Aug 2025 12:20:37 +0800
Subject: [PATCH 07/17] Fix installer build issue

---
 Installer/Product.wxs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Installer/Product.wxs b/Installer/Product.wxs
index ba6458e2..866cbaa6 100644
--- a/Installer/Product.wxs
+++ b/Installer/Product.wxs
@@ -96,9 +96,6 @@
             <Component Guid="{301c2287-ca21-4013-82b0-5895d89216ea}">
                 <File Id="Microsoft.Extensions.DependencyInjection.dll" Source="$(var.FileConverter.TargetDir)Microsoft.Extensions.DependencyInjection.dll" KeyPath="yes" Checksum="yes" />
             </Component>
-            <Component Guid="{101923f7-d0f9-47f5-9c59-13ec5ca81b37}">
-                <File Id="Microsoft.Xaml.Behaviors.dll" Source="$(var.FileConverter.TargetDir)Microsoft.Xaml.Behaviors.dll" KeyPath="yes" Checksum="yes" />
-            </Component>
             <Component Guid="{e5a7ebe5-30ba-4ee9-be63-f1b39101dff6}">
                 <File Id="System.Buffers.dll" Source="$(var.FileConverter.TargetDir)System.Buffers.dll" KeyPath="yes" Checksum="yes" />
             </Component>
@@ -150,6 +147,16 @@
                 <File Id="WpfAnimatedGif.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)WpfAnimatedGif.dll" Checksum="yes" />
             </Component>
             
+            <Component Guid="{101923f7-d0f9-47f5-9c59-13ec5ca81b37}">
+              <File Id="iNKORE.UI.WPF.Modern.dll" Source="$(var.FileConverter.TargetDir)iNKORE.UI.WPF.Modern.dll" KeyPath="yes" Checksum="yes" />
+            </Component>
+            <Component Guid="{43f9be2f-90ec-4435-acfa-4e61ee894c9e}">
+              <File Id="iNKORE.UI.WPF.Modern.Controls.dll" Source="$(var.FileConverter.TargetDir)iNKORE.UI.WPF.Modern.Controls.dll" KeyPath="yes" Checksum="yes" />
+            </Component>
+            <Component Guid="{29f4ab31-dd37-42b1-a457-c72e3a91521a}">
+              <File Id="iNKORE.UI.WPF.dll" Source="$(var.FileConverter.TargetDir)iNKORE.UI.WPF.dll" KeyPath="yes" Checksum="yes" />
+            </Component>
+
             <!-- Configuration and documentation -->
             <Component Guid="{AD58807A-2AE2-48BE-AB55-9BDE9BBE37F3}">
                 <File Id="Settings.default.xml" Source="$(var.FileConverter.ProjectDir)\Settings.default.xml" KeyPath="yes" />

From af15541ba985cf71df2d1bc828e8ea4b49e7c65a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 23 Aug 2025 14:13:41 +0800
Subject: [PATCH 08/17] Improve setting window design

---
 Application/FileConverter/Views/SettingsWindow.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/FileConverter/Views/SettingsWindow.xaml b/Application/FileConverter/Views/SettingsWindow.xaml
index ecc3606e..0c3f4b13 100644
--- a/Application/FileConverter/Views/SettingsWindow.xaml
+++ b/Application/FileConverter/Views/SettingsWindow.xaml
@@ -13,7 +13,7 @@
         xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
         ui:ThemeManager.IsThemeAware="True"
         ui:ThemeManager.RequestedTheme="Default"
-        ui:TitleBar.ExtendViewIntoTitleBar="False"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
         ui:TitleBar.Height="48"
         ui:WindowHelper.SystemBackdropType="Mica"
         ui:WindowHelper.UseModernWindowStyle="True"
@@ -219,7 +219,7 @@
         <Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
     </Window.Title>
 
-    <Grid Margin="10 0 10 10">
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="53"/>
             <RowDefinition Height="*"/>

From acdc68fd0d8897b5533792ec1f6df4166c1c1421 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 23 Aug 2025 22:20:01 +0800
Subject: [PATCH 09/17] Improve TileButton as AppBarButton

---
 .../FileConverter/Views/Resources/CustomStyles.xaml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Application/FileConverter/Views/Resources/CustomStyles.xaml b/Application/FileConverter/Views/Resources/CustomStyles.xaml
index c8d74b68..ec2ed497 100644
--- a/Application/FileConverter/Views/Resources/CustomStyles.xaml
+++ b/Application/FileConverter/Views/Resources/CustomStyles.xaml
@@ -70,8 +70,8 @@
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Grid x:Name="grid">
                         <Border x:Name="border" CornerRadius="8" BorderThickness="1"
-                                Background="{DynamicResource TileButton_BackgroundBrush}"
-                                BorderBrush="{DynamicResource TileButton_BorderBrush}">
+                                Background="{DynamicResource AppBarButtonBackground}"
+                                BorderBrush="{DynamicResource AppBarButtonBorderBrush}">
                         </Border>
                         <ContentPresenter HorizontalAlignment="Center"
                                           VerticalAlignment="Center"
@@ -80,12 +80,12 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource TileButton_IsMouseOver_BackgroundBrush}" />
-                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource TileButton_IsMouseOver_BorderBrush}" />
+                            <Setter Property="Background" TargetName="border" Value="{DynamicResource AppBarButtonBackgroundPointerOver}" />
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource AppBarButtonBorderBrushPointerOver}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource TileButton_IsPressed_BackgroundBrush}" />
-                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource TileButton_IsPressed_BorderBrush}" />
+                            <Setter Property="Background" TargetName="border" Value="{DynamicResource AppBarButtonBackgroundPressed}" />
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource AppBarButtonBorderBrushPressed}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" TargetName="grid" Value="0.25"/>

From ccbfb7df067fbdb4756be247e3228d8af95c2f21 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 23 Aug 2025 22:22:59 +0800
Subject: [PATCH 10/17] Improve icon in ConversionJobControl

---
 Application/FileConverter/Controls/ConversionJobControl.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/FileConverter/Controls/ConversionJobControl.xaml b/Application/FileConverter/Controls/ConversionJobControl.xaml
index caed4eb7..ca81c0f0 100644
--- a/Application/FileConverter/Controls/ConversionJobControl.xaml
+++ b/Application/FileConverter/Controls/ConversionJobControl.xaml
@@ -15,7 +15,7 @@
         <Grid Margin="0,4">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="64"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
 
             <Grid Margin="10" Grid.Column="0">
@@ -54,7 +54,7 @@
                 </StackPanel>
             </Grid>
 
-            <Button Margin="3" Grid.Column="1" Height="57" 
+            <Button Margin="3" Grid.Column="1" Height="Auto" 
                     Visibility="{Binding State, ConverterParameter=|InProgress|Collapsed, Converter={StaticResource EnumEqualsToVisibility}}" 
                     Command="{Binding CancelCommand}" ToolTip="{x:Static project:Resources.CancelJobTooltip}">
                 <Image Source="/FileConverter;component/Resources/CancelIcon.png" Width="48" Height="48" Style="{StaticResource EnableDisableImageStyle}" />

From b040a5635c2065a1a938db515c1751b0cc072ae4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 23 Aug 2025 22:31:29 +0800
Subject: [PATCH 11/17] Improve ConversionJobControl text color

---
 .../FileConverter/Controls/ConversionJobControl.xaml      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Application/FileConverter/Controls/ConversionJobControl.xaml b/Application/FileConverter/Controls/ConversionJobControl.xaml
index ca81c0f0..0f8698a5 100644
--- a/Application/FileConverter/Controls/ConversionJobControl.xaml
+++ b/Application/FileConverter/Controls/ConversionJobControl.xaml
@@ -5,6 +5,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
         xmlns:project="clr-namespace:FileConverter.Properties"
         xmlns:conversionJobs="clr-namespace:FileConverter.ConversionJobs"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
         x:Class="FileConverter.Controls.ConversionJobControl"
         mc:Ignorable="d" 
         d:DesignHeight="100" d:DesignWidth="800">
@@ -28,12 +30,12 @@
                     <ColumnDefinition Width="*" MinWidth="100" />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding OutputFilePath}" Foreground="#DD000000" FontWeight="Bold" />
+                <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding OutputFilePath}" Foreground="{DynamicResource TextFillColorPrimaryBrush}" FontWeight="Bold" />
 
                 <StackPanel Grid.Row="1" Grid.Column="0" Margin="10,0,0,0">
                     <WrapPanel>
-                        <TextBlock Text="{x:Static project:Resources.ConvertedFrom}" Foreground="#AA000000" FontSize="11" FontStyle="Italic" Margin="0,0,5,0" />
-                        <TextBlock Text="{Binding InputFilePath}" Foreground="#AA000000" FontSize="11" FontStyle="Italic" />
+                        <TextBlock Text="{x:Static project:Resources.ConvertedFrom}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" FontSize="11" FontStyle="Italic" Margin="0,0,5,0" />
+                        <TextBlock Text="{Binding InputFilePath}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" FontSize="11" FontStyle="Italic" />
                     </WrapPanel>
                     <TextBlock Text="{Binding ErrorMessage}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToBrush}}" FontSize="14" />
                 </StackPanel>

From 57ad5aa3598bc4ec91b9dd13264458a51b36cd73 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 27 Aug 2025 14:09:30 +0800
Subject: [PATCH 12/17] Improve ConversionJobControl text color

---
 .../FileConverter/Controls/ConversionJobControl.xaml        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/FileConverter/Controls/ConversionJobControl.xaml b/Application/FileConverter/Controls/ConversionJobControl.xaml
index 0f8698a5..d27ed2ed 100644
--- a/Application/FileConverter/Controls/ConversionJobControl.xaml
+++ b/Application/FileConverter/Controls/ConversionJobControl.xaml
@@ -30,12 +30,12 @@
                     <ColumnDefinition Width="*" MinWidth="100" />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding OutputFilePath}" Foreground="{DynamicResource TextFillColorPrimaryBrush}" FontWeight="Bold" />
+                <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding OutputFilePath}" Foreground="#E4000000" FontWeight="Bold" />
 
                 <StackPanel Grid.Row="1" Grid.Column="0" Margin="10,0,0,0">
                     <WrapPanel>
-                        <TextBlock Text="{x:Static project:Resources.ConvertedFrom}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" FontSize="11" FontStyle="Italic" Margin="0,0,5,0" />
-                        <TextBlock Text="{Binding InputFilePath}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" FontSize="11" FontStyle="Italic" />
+                        <TextBlock Text="{x:Static project:Resources.ConvertedFrom}" Foreground="#E4000000" FontSize="11" FontStyle="Italic" Margin="0,0,5,0" />
+                        <TextBlock Text="{Binding InputFilePath}" Foreground="#E4000000" FontSize="11" FontStyle="Italic" />
                     </WrapPanel>
                     <TextBlock Text="{Binding ErrorMessage}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToBrush}}" FontSize="14" />
                 </StackPanel>

From 1da7326a721a23acf944ea39e2b9cd530d6cb3f0 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 28 Aug 2025 12:00:20 +0800
Subject: [PATCH 13/17] Make sure done & failed icons are on the same position
 as the cancel icon

---
 Application/FileConverter/Controls/ConversionJobControl.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/FileConverter/Controls/ConversionJobControl.xaml b/Application/FileConverter/Controls/ConversionJobControl.xaml
index d27ed2ed..f1713626 100644
--- a/Application/FileConverter/Controls/ConversionJobControl.xaml
+++ b/Application/FileConverter/Controls/ConversionJobControl.xaml
@@ -61,9 +61,9 @@
                     Command="{Binding CancelCommand}" ToolTip="{x:Static project:Resources.CancelJobTooltip}">
                 <Image Source="/FileConverter;component/Resources/CancelIcon.png" Width="48" Height="48" Style="{StaticResource EnableDisableImageStyle}" />
             </Button>
-            <Image Margin="3" Grid.Column="1" Source="/FileConverter;component/Resources/SuccessIcon.png" Width="48" Height="48" 
+            <Image Margin="15,3,15,3" Grid.Column="1" Source="/FileConverter;component/Resources/SuccessIcon.png" Width="48" Height="48" 
                    Visibility="{Binding State, ConverterParameter=|Done|Collapsed, Converter={StaticResource EnumEqualsToVisibility}}"/>
-            <Image Margin="3" Grid.Column="1" Source="/FileConverter;component/Resources/FailIcon.png" Width="48" Height="48" 
+            <Image Margin="15,3,15,3" Grid.Column="1" Source="/FileConverter;component/Resources/FailIcon.png" Width="48" Height="48" 
                    Visibility="{Binding State, ConverterParameter=|Failed|Collapsed, Converter={StaticResource EnumEqualsToVisibility}}"/>
         </Grid>
     </Border>

From 9c276076e3069bedb2956081e3869d12b2b73f10 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Oct 2025 19:56:01 +0800
Subject: [PATCH 14/17] Adjust row height in SettingsWindow.xaml to be dynamic

---
 Application/FileConverter/Views/SettingsWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/FileConverter/Views/SettingsWindow.xaml b/Application/FileConverter/Views/SettingsWindow.xaml
index 0c3f4b13..7f33955a 100644
--- a/Application/FileConverter/Views/SettingsWindow.xaml
+++ b/Application/FileConverter/Views/SettingsWindow.xaml
@@ -49,7 +49,7 @@
                             <ColumnDefinition Width="*" MaxWidth="240"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="Auto"/>
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
 

From a884f7c33e4d5e1c442b87d2e66e4687c4b621c6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Oct 2025 20:13:01 +0800
Subject: [PATCH 15/17] Add CheckBoxMinWidth resource and sys namespace

---
 Application/FileConverter/Application.xaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Application/FileConverter/Application.xaml b/Application/FileConverter/Application.xaml
index f9739dc5..be3e709d 100644
--- a/Application/FileConverter/Application.xaml
+++ b/Application/FileConverter/Application.xaml
@@ -7,6 +7,7 @@
              xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
              xmlns:viewModels="clr-namespace:FileConverter.ViewModels"
              xmlns:services="clr-namespace:FileConverter.Services"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
              xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
              ShutdownMode="OnLastWindowClose">
@@ -75,6 +76,9 @@
                 <valueConverters:ChangelogConverter/>
                 <xaml:TextToFlowDocumentConverter Markdown="{StaticResource Markdown}"/>
             </generic:ValueConverterGroup>
+
+            <!--  Override styles in UI.Modern.WPF  -->
+            <sys:Double x:Key="CheckBoxMinWidth">0</sys:Double>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

From ac5c2639058361e07c17ac11df96eb3aed28d093 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Oct 2025 20:18:08 +0800
Subject: [PATCH 16/17] Update CheckBox bindings and remove redundant IsEnabled

Modified CheckBox bindings in ConversionPresetTemplates.xaml:
- Removed `IsEnabled` bindings for two CheckBox elements.
- Updated `IsChecked` binding to use `Mode=TwoWay` for one CheckBox.
- Added `Margin="0,6,0,0"` to one CheckBox for improved layout.
---
 .../Views/Resources/ConversionPresetTemplates.xaml             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml b/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
index 4da027a2..b6daaaf7 100644
--- a/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
+++ b/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
@@ -368,7 +368,7 @@
 
             <DockPanel Grid.Row="5" Grid.Column="0">
                 <CheckBox
-                    Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"
+                    Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold"
                     IsChecked="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=TwoWay}" Margin="0,6,0,0" />
                 <Label Content="(AAC)" FontWeight="Light" Foreground="{DynamicResource HyperlinkForeground}" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
             </DockPanel>
@@ -670,7 +670,6 @@
                 <CheckBox Margin="0,6,0,0"
                           FontWeight="Bold" 
                           Content="{x:Static project:Resources.AdvancedMode}"
-                          IsEnabled="{Binding Settings, ConverterParameter=EnableFFMPEGCustomCommand|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"
                           IsChecked="{Binding Settings, ConverterParameter=EnableFFMPEGCustomCommand|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=TwoWay}" />
             </DockPanel>
             <Grid Visibility="{Binding Settings, Converter={StaticResource ConversionSettingsToVisibility}, ConverterParameter=EnableFFMPEGCustomCommand|System.Boolean|Collapsed}">

From 81833e5d8114b54bb45056f98e3fe1aae9bc149a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Oct 2025 20:23:32 +0800
Subject: [PATCH 17/17] Refactor audio settings layout to use StackPanel

Replaced DockPanel with a horizontally oriented StackPanel
for audio settings at Grid.Row="5" and Grid.Column="0".
Moved the CheckBox and Label elements into the new
StackPanel for improved layout consistency. Updated the
Label's VerticalAlignment to Center for better alignment.
No functional changes were made to bindings or converters.
---
 .../Views/Resources/ConversionPresetTemplates.xaml        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml b/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
index b6daaaf7..95d89b7f 100644
--- a/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
+++ b/Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
@@ -366,12 +366,12 @@
                                  IsChecked="{Binding Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, Mode=TwoWay}"/>
             </StackPanel>
 
-            <DockPanel Grid.Row="5" Grid.Column="0">
+            <StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="0">
                 <CheckBox
                     Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold"
-                    IsChecked="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=TwoWay}" Margin="0,6,0,0" />
-                <Label Content="(AAC)" FontWeight="Light" Foreground="{DynamicResource HyperlinkForeground}" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
-            </DockPanel>
+                    IsChecked="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=TwoWay}" />
+                <Label VerticalAlignment="Center" Content="(AAC)" FontWeight="Light" Foreground="{DynamicResource HyperlinkForeground}" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
+            </StackPanel>
 
             <Label Content="{x:Static project:Resources.Quality}" Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"/>
             <controls:EncodingQualitySliderControl Grid.Row="6" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="AacVBR" IsEnabled="{Binding Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, Mode=OneWay}"