Skip to content

Port WPF desktop UI from MahApps to WPF UI #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 4 commits into
base: development
Choose a base branch
from
Draft

Port WPF desktop UI from MahApps to WPF UI #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca14468
Port WPF resources to WPF UI
Copilot Apr 29, 2026
468c1a8
Complete WPF UI control migration
Copilot Apr 29, 2026
8321a24
Preserve UI scaling decimal input
Copilot Apr 29, 2026
9d6e8a2
Restore WPF UI title bars and theme dictionaries
Copilot Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eula.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ Fontawesome.WPF:
MIT License
Copyright (c) 2014-2016 charri
https://github.com/charri/Font-Awesome-WPF
MahApps.Metro:
WPF-UI:
MIT License
Copyright (c) 2016 MahApps
http://mahapps.com/
Copyright (c) 2021-2025 Leszek Pomianowski and WPF UI Contributors.
https://github.com/lepoco/wpfui
ARSoft.Tools.Net:
Apache License 2.0
Copyright (c) 2010-2017 Alexander Reinert
Expand Down
6 changes: 3 additions & 3 deletions src/Certify.Shared.Extensions/THIRD_PARTY_LICENSES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Fontawesome.WPF:
MIT License
Copyright (c) 2014-2016 charri
https://github.com/charri/Font-Awesome-WPF
MahApps.Metro:
WPF-UI:
MIT License
Copyright (c) .NET Foundation and Contributors.
https://mahapps.com/
Copyright (c) 2021-2025 Leszek Pomianowski and WPF UI Contributors.
https://github.com/lepoco/wpfui
Markdig:
BSD 2-Clause "Simplified" License
Copyright (c) 2018-2019, Alexandre Mutel
Expand Down
6 changes: 3 additions & 3 deletions src/Certify.Tests/Core.Integration/plugins/THIRD_PARTY_LICENSES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Fontawesome.WPF:
MIT License
Copyright (c) 2014-2016 charri
https://github.com/charri/Font-Awesome-WPF
MahApps.Metro:
WPF-UI:
MIT License
Copyright (c) .NET Foundation and Contributors.
https://mahapps.com/
Copyright (c) 2021-2025 Leszek Pomianowski and WPF UI Contributors.
https://github.com/lepoco/wpfui
Markdig:
BSD 2-Clause "Simplified" License
Copyright (c) 2018-2019, Alexandre Mutel
Expand Down
41 changes: 8 additions & 33 deletions src/Certify.UI.Desktop/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@
x:Class="Certify.UI.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:utils="clr-namespace:Certify.UI.Utils;assembly=Certify.UI.Shared"
StartupUri="pack://application:,,,/Certify.UI.Shared;component/Windows/MainWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Green.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Green.xaml" />

<ui:ThemesDictionary Theme="Light" />
<ui:ControlsDictionary />
<ResourceDictionary Source="pack://application:,,,/ToastNotifications.Messages;component/Themes/Default.xaml" />
</ResourceDictionary.MergedDictionaries>
<!-- Heading -->
Expand All @@ -36,43 +33,21 @@
<Setter Property="FontFamily" Value="Segoe UI" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Padding" Value="0,6,0,6" />
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMediumHigh}" />
<Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
<Setter Property="TextWrapping" Value="WrapWithOverflow" />

</Style>
<Style x:Key="Info" TargetType="TextBlock">
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="FontFamily" Value="Segoe UI" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Padding" Value="0,2,0,2" />
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMediumHigh}" />
<Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
<Setter Property="TextWrapping" Value="WrapWithOverflow" />
</Style>

<!-- brush color overrides (tab items and disabled buttons) -->
<SolidColorBrush x:Key="MahApps.Brushes.Gray" Color="{DynamicResource MahApps.Colors.SystemChromeHigh}" />
<SolidColorBrush x:Key="MahApps.Brushes.Control.Disabled" Color="{DynamicResource MahApps.Colors.SystemAltLow}" />

<Style TargetType="controls:NumericUpDown">
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}" />
</Style>

<Style BasedOn="{StaticResource MahApps.Styles.ComboBox}" TargetType="ComboBox">
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}" />
</Style>

<Style BasedOn="{StaticResource MahApps.Styles.TextBox}" TargetType="TextBox">
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}" />
</Style>

<Style BasedOn="{StaticResource MahApps.Styles.Button}" TargetType="Button">
<Setter Property="FontSize" Value="12" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="BorderThickness" Value="1" />

<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}" />
<Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
<Setter Property="controls:ControlsHelper.CornerRadius" Value="0" />
<Style BasedOn="{StaticResource {x:Type ui:NumberBox}}" TargetType="ui:NumberBox">
<Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
<Setter Property="SpinButtonPlacementMode" Value="Compact" />
</Style>

<!-- control templates -->
Expand Down
3 changes: 1 addition & 2 deletions src/Certify.UI.Shared/Certify.UI.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ControlzEx" Version="7.0.4" />
<PackageReference Include="Fody" Version="6.9.3" PrivateAssets="All" />
<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9">
<NoWarn>NU1701</NoWarn>
</PackageReference>
<PackageReference Include="MahApps.Metro" Version="3.0.0-rc0529" />
<PackageReference Include="WPF-UI" Version="4.2.1" />
<PackageReference Include="Markdig" Version="1.1.3" />
<PackageReference Include="Markdig.Wpf" Version="0.5.0.1" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
Expand Down
10 changes: 4 additions & 6 deletions src/Certify.UI.Shared/Controls/GettingStarted.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
x:Class="Certify.UI.Controls.GettingStarted"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Custom="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:fa="http://schemas.fontawesome.io/icons/"
xmlns:local="clr-namespace:Certify.UI.Controls"
Expand All @@ -27,13 +26,13 @@
Margin="0,0,0,0"
FontFamily="Segoe UI"
FontSize="30"
Foreground="{DynamicResource MahApps.Brushes.Gray1}"
Foreground="{DynamicResource TextFillColorTertiaryBrush}"
TextWrapping="Wrap"><Run FontWeight="Bold" Text="Certify" /><Run Text=" the web" /></TextBlock>
<TextBlock
Margin="0,0,0,8"
FontFamily="Segoe UI"
FontSize="16"
Foreground="{DynamicResource MahApps.Brushes.Gray1}"
Foreground="{DynamicResource TextFillColorTertiaryBrush}"
Text="Certify Certificate Manager"
TextWrapping="Wrap" />
<TextBlock Style="{StaticResource Instructions}" TextWrapping="Wrap">
Expand All @@ -47,7 +46,6 @@
<GroupBox
x:Name="CommunityEdition"
Margin="0,16,0,0"
Custom:HeaderedControlHelper.HeaderBackground="{StaticResource ErrorColorBrush}"
BorderThickness="0"
Header="License Not Activated"
Visibility="{Binding IsLicenseUpgradeRecommended, Converter={StaticResource ResourceKey=BooleanToVisibilityConverter}}">
Expand All @@ -72,7 +70,7 @@
VerticalAlignment="Top"
FontSize="12"
FontWeight="Bold"
Foreground="{StaticResource MahApps.Brushes.IdealForeground}"
Foreground="{StaticResource TextOnAccentFillColorPrimaryBrush}"
Text="Your license key has expired. Some features will be reduced or unavailable. Please Sign In to https://certifytheweb.com and renew your license key, then re-open the app."
TextWrapping="Wrap" />

Expand Down Expand Up @@ -153,7 +151,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Top"
FontSize="12"
Foreground="{StaticResource MahApps.Brushes.IdealForeground}"
Foreground="{StaticResource TextOnAccentFillColorPrimaryBrush}"
Text="{Binding SystemDiagnosticError}"
TextWrapping="Wrap" />

Expand Down
39 changes: 16 additions & 23 deletions src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
x:Class="Certify.UI.Controls.ManagedCertificate.AdvancedOptions"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:Resources="clr-namespace:Certify.Locales;assembly=Certify.Locales"
xmlns:certifyui="clr-namespace:Certify.UI"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand Down Expand Up @@ -32,14 +32,11 @@
Margin="0,0,0,0"
HorizontalContentAlignment="Left"
VerticalContentAlignment="Stretch"
Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}"
Controls:TabControlHelper.Underlined="TabPanel"
DockPanel.Dock="Top"
TabStripPlacement="Left">
<TabItem
Height="32"
MinWidth="140"
Controls:HeaderedControlHelper.HeaderFontSize="12"
Header="{x:Static Resources:SR.ManagedCertificateSettings_CertificateAuthority_Title}"
IsSelected="true"
Visibility="{Binding IsExternalManagedCertificateItem, Converter={StaticResource ResourceKey=InvBoolToVisConverter}, UpdateSourceTrigger=PropertyChanged}">
Expand Down Expand Up @@ -87,10 +84,10 @@
Style="{StaticResource Instructions}"
Text="{x:Static Resources:SR.ManagedCertificateSettings_CertificateAuthority_PreferredChain_Instructions}" />

<TextBox
<ui:TextBox
Width="200"
HorizontalAlignment="left"
Controls:TextBoxHelper.Watermark="e.g. DST Root CA X3"
PlaceholderText="e.g. DST Root CA X3"
DockPanel.Dock="Top"
Text="{Binding SelectedItem.RequestConfig.PreferredChain}" />
<TextBlock
Expand All @@ -102,10 +99,10 @@
<TextBlock DockPanel.Dock="Top" Style="{StaticResource Instructions}">
The certificate authority may allow you to specify a preset "profile" name for your certificate order.
</TextBlock>
<TextBox
<ui:TextBox
Width="200"
HorizontalAlignment="left"
Controls:TextBoxHelper.Watermark="e.g. classic"
PlaceholderText="e.g. classic"
DockPanel.Dock="Top"
Text="{Binding SelectedItem.RequestConfig.AcmeProfile}" />
</DockPanel>
Expand All @@ -114,7 +111,6 @@
<TabItem
Height="32"
MinWidth="100"
Controls:HeaderedControlHelper.HeaderFontSize="12"
Header="Signing &amp; Security"
IsSelected="False"
Visibility="{Binding IsExternalManagedCertificateItem, Converter={StaticResource ResourceKey=InvBoolToVisConverter}, UpdateSourceTrigger=PropertyChanged}">
Expand Down Expand Up @@ -255,11 +251,11 @@
</StackPanel>
<TextBlock Style="{StaticResource Instructions}">You can optionally limit the lifetime (in Days) of a certificate, if supported by the CA. Use this with caution as most CAs will reject the order if they don't support this feature:</TextBlock>

<TextBox
<ui:TextBox
Width="180"
Margin="8,0,4,0"
HorizontalAlignment="left"
Controls:TextBoxHelper.Watermark="e.g. 0.5 or 30. Blank for none."
PlaceholderText="e.g. 0.5 or 30. Blank for none."
InputScope="Number"
Text="{Binding SelectedItem.RequestConfig.PreferredExpiryDays, Converter={StaticResource NullValueConverter}}" />

Expand All @@ -274,7 +270,6 @@
<TabItem
Height="32"
MinWidth="100"
Controls:HeaderedControlHelper.HeaderFontSize="12"
Header="General Options"
IsSelected="false">
<!-- General Options -->
Expand All @@ -286,20 +281,20 @@
<TextBlock DockPanel.Dock="Top" Style="{StaticResource Subheading}">General Options</TextBlock>
<DockPanel Margin="0,8" DockPanel.Dock="Top">

<TextBox
<ui:TextBox
Width="Auto"
Height="38"
MinWidth="300"
MaxWidth="600"
HorizontalAlignment="Left"
Controls:TextBoxHelper.Watermark="{x:Static Resources:SR.Comments}"
PlaceholderText="{x:Static Resources:SR.Comments}"
AcceptsReturn="True"
DockPanel.Dock="Top"
VerticalScrollBarVisibility="Auto">
<TextBox.Text>
<ui:TextBox.Text>
<Binding Path="SelectedItem.Comments" UpdateSourceTrigger="PropertyChanged" />
</TextBox.Text>
</TextBox>
</ui:TextBox.Text>
</ui:TextBox>

</DockPanel>
<StackPanel
Expand Down Expand Up @@ -349,7 +344,6 @@

<TabItem
MinWidth="100"
Controls:HeaderedControlHelper.HeaderFontSize="12"
Header="Actions"
IsSelected="False">
<!-- Actions -->
Expand Down Expand Up @@ -379,7 +373,6 @@
Width="220"
Margin="0,4,0,8"
HorizontalAlignment="Left"
Controls:TextBoxHelper.Watermark="Pfx Unlock Password (if applicable)"
PasswordChanged="PFXPassword_PasswordChanged" />
</StackPanel>

Expand Down Expand Up @@ -424,7 +417,7 @@
BorderThickness="2"
Content="{x:Static Resources:SR.ManagedCertificateSettings_CertificateRevokeWarning}"
FontWeight="Bold"
Foreground="{DynamicResource MahApps.Brushes.IdealForeground}" />
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}" />
</Border>
</StackPanel>

Expand Down Expand Up @@ -467,7 +460,7 @@
HorizontalAlignment="Left"
Style="{StaticResource Instructions}"
Text="Managed Certificate Reference Id:" />
<TextBox
<ui:TextBox
MaxWidth="500"
Margin="0,8,0,0"
HorizontalAlignment="Left"
Expand All @@ -482,7 +475,7 @@
HorizontalAlignment="Left"
Style="{StaticResource Instructions}"
Text="Current Certificate file path (changes after every renewal):" />
<TextBox
<ui:TextBox
x:Name="CertPath"
MaxWidth="500"
Margin="0,8,0,0"
Expand All @@ -498,7 +491,7 @@
HorizontalAlignment="Left"
Style="{StaticResource Instructions}"
Text="Current Certificate Order Uri:" />
<TextBox
<ui:TextBox
x:Name="CertOrderUri"
MaxWidth="500"
Margin="0,8,0,0"
Expand Down
14 changes: 7 additions & 7 deletions src/Certify.UI.Shared/Controls/ManagedCertificate/AuthorityTokenList.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<UserControl
<UserControl
x:Class="Certify.UI.Controls.ManagedCertificate.AuthorityTokenList"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:certifyui="clr-namespace:Certify.UI"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:fa="http://schemas.fontawesome.io/icons/"
Expand Down Expand Up @@ -45,16 +45,16 @@
Margin="0,8,8,8"
DockPanel.Dock="Top"
Orientation="Vertical">
<TextBox
<ui:TextBox
x:Name="Token"
Height="48"
Controls:TextBoxHelper.Watermark="Token"
PlaceholderText="Token"
Text="" />
<TextBox
<ui:TextBox
x:Name="CRL"
Width="Auto"
Margin="0,8"
Controls:TextBoxHelper.Watermark="CRL Distribution Point URL"
PlaceholderText="CRL Distribution Point URL"
Text="" />
<Button
x:Name="AddToken"
Expand Down Expand Up @@ -101,7 +101,7 @@
<fa:ImageAwesome
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource MahApps.Brushes.Accent}"
Foreground="{StaticResource AccentFillColorDefaultBrush}"
Icon="Trash" />

</StackPanel>
Expand Down
Loading