diff --git a/eula.txt b/eula.txt index 8932a60fa..346fb73c2 100644 --- a/eula.txt +++ b/eula.txt @@ -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 diff --git a/src/Certify.Shared.Extensions/THIRD_PARTY_LICENSES.txt b/src/Certify.Shared.Extensions/THIRD_PARTY_LICENSES.txt index 00f8a42e5..ab8b38662 100644 --- a/src/Certify.Shared.Extensions/THIRD_PARTY_LICENSES.txt +++ b/src/Certify.Shared.Extensions/THIRD_PARTY_LICENSES.txt @@ -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 diff --git a/src/Certify.Tests/Core.Integration/plugins/THIRD_PARTY_LICENSES.txt b/src/Certify.Tests/Core.Integration/plugins/THIRD_PARTY_LICENSES.txt index 00f8a42e5..ab8b38662 100644 --- a/src/Certify.Tests/Core.Integration/plugins/THIRD_PARTY_LICENSES.txt +++ b/src/Certify.Tests/Core.Integration/plugins/THIRD_PARTY_LICENSES.txt @@ -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 diff --git a/src/Certify.UI.Desktop/App.xaml b/src/Certify.UI.Desktop/App.xaml index 05f269b45..1c4a6f961 100644 --- a/src/Certify.UI.Desktop/App.xaml +++ b/src/Certify.UI.Desktop/App.xaml @@ -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"> - - - - - + + @@ -36,43 +33,21 @@ - + - - - - - - - - - - - - diff --git a/src/Certify.UI.Shared/Certify.UI.Shared.csproj b/src/Certify.UI.Shared/Certify.UI.Shared.csproj index a2ff71ac2..a6ca38bd0 100644 --- a/src/Certify.UI.Shared/Certify.UI.Shared.csproj +++ b/src/Certify.UI.Shared/Certify.UI.Shared.csproj @@ -25,12 +25,11 @@ - NU1701 - + diff --git a/src/Certify.UI.Shared/Controls/GettingStarted.xaml b/src/Certify.UI.Shared/Controls/GettingStarted.xaml index 638d6be29..0625bfcaa 100644 --- a/src/Certify.UI.Shared/Controls/GettingStarted.xaml +++ b/src/Certify.UI.Shared/Controls/GettingStarted.xaml @@ -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" @@ -27,13 +26,13 @@ Margin="0,0,0,0" FontFamily="Segoe UI" FontSize="30" - Foreground="{DynamicResource MahApps.Brushes.Gray1}" + Foreground="{DynamicResource TextFillColorTertiaryBrush}" TextWrapping="Wrap"> @@ -47,7 +46,6 @@ @@ -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" /> @@ -153,7 +151,7 @@ HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12" - Foreground="{StaticResource MahApps.Brushes.IdealForeground}" + Foreground="{StaticResource TextOnAccentFillColorPrimaryBrush}" Text="{Binding SystemDiagnosticError}" TextWrapping="Wrap" /> diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml index b378b10c5..7c9394296 100644 --- a/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml +++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml @@ -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" @@ -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"> @@ -87,10 +84,10 @@ Style="{StaticResource Instructions}" Text="{x:Static Resources:SR.ManagedCertificateSettings_CertificateAuthority_PreferredChain_Instructions}" /> - The certificate authority may allow you to specify a preset "profile" name for your certificate order. - @@ -114,7 +111,6 @@ @@ -255,11 +251,11 @@ 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: - @@ -274,7 +270,6 @@ @@ -286,20 +281,20 @@ General Options - - + - - + + @@ -379,7 +373,6 @@ Width="220" Margin="0,4,0,8" HorizontalAlignment="Left" - Controls:TextBoxHelper.Watermark="Pfx Unlock Password (if applicable)" PasswordChanged="PFXPassword_PasswordChanged" /> @@ -424,7 +417,7 @@ BorderThickness="2" Content="{x:Static Resources:SR.ManagedCertificateSettings_CertificateRevokeWarning}" FontWeight="Bold" - Foreground="{DynamicResource MahApps.Brushes.IdealForeground}" /> + Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}" /> @@ -467,7 +460,7 @@ HorizontalAlignment="Left" Style="{StaticResource Instructions}" Text="Managed Certificate Reference Id:" /> - - - - - @@ -340,7 +336,7 @@ ToolTip="{x:Static Resources:SR.SelectAll}"> @@ -354,7 +350,7 @@ ToolTip="{x:Static Resources:SR.ManagedCertificateSettings_SelectNone}"> @@ -369,13 +365,13 @@ ToolTip="{x:Static Resources:SR.ManagedCertificatesSettings_RefreshDomains}"> - Client ID: - Client Secret: - - + - - + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - + DockPanel.Dock="Top" + Style="{StaticResource SubheadingWithMargin}" + Text="Manage Data Stores" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + diff --git a/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml b/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml index 3ff3a1e74..e7a0bfd56 100644 --- a/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml +++ b/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml @@ -1,8 +1,8 @@ - - + - - + + + + + + + + + - - - - - - - - - - - - - - + + + - - - - - - - - - - - - Mode & Preferences - - If you need to test certificate requests without affecting your CA rate limit you can use an account which only issues test (staging) certificates: - - - - The authority may offer an "alternative chain" using a different root certificate: - - - - - - External Account Binding - If required by your Certificate Authority, you can provide external account binding details here. - - - - + Style="{StaticResource Instructions}" + TextWrapping="Wrap"> + - + + + - Import or Custom Account Details - If you need to import an account from another client instead of registering a new account with the CA, or you need to customize or pre-generate the account key, you can optionally specify the Account URI and/or Account Key (PEM encoded private key): + - - - - - For account pre-approval and other advanced scenarios you can optionally pre-generate a custom keypair for your ACME account: - - - - - - - Name - + + + + + + + + + + + + - Description - + + + Name + - Days of Week - - - Sunday - - - Monday - - - Tuesday - - - Wednesday - - - Thursday - - - Friday - - - Saturday - - + Description + - - - - - - + Days of Week + + + Sunday + + + Monday + + + Tuesday + + + Wednesday + + + Thursday + + + Friday + + + Saturday + + - Time Range - - - Start Time (24-hour format) - - - - - : - - - - - End Time (24-hour format) - - + + + + + - - : - - + + Time Range + + + Start Time (24-hour format) + + + + + : + + + + + End Time (24-hour format) + + + + + : + + + - - - - This window spans overnight (e.g., starts one day and ends the next morning). - - + + + This window spans overnight (e.g., starts one day and ends the next morning). + + - Timezone - + Timezone + - + - - - Schedule Preview: - - - - - - - + + + Schedule Preview: + + + + + + + + + diff --git a/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml.cs b/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml.cs index 4b75fc94d..430d9b00e 100644 --- a/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml.cs +++ b/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml.cs @@ -151,7 +151,7 @@ private void SetNoDays_Click(object sender, RoutedEventArgs e) UpdateSchedulePreview(); } - private void Time_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) + private void Time_ValueChanged(object sender, Wpf.Ui.Controls.NumberBoxValueChangedEventArgs e) { if (StartHour?.Value == null || StartMinute?.Value == null || EndHour?.Value == null || EndMinute?.Value == null) { diff --git a/src/Certify.UI.Shared/Windows/EditServerConnection.xaml b/src/Certify.UI.Shared/Windows/EditServerConnection.xaml index 64722da9a..ecbc6513a 100644 --- a/src/Certify.UI.Shared/Windows/EditServerConnection.xaml +++ b/src/Certify.UI.Shared/Windows/EditServerConnection.xaml @@ -1,8 +1,8 @@ - - + - + - + + + + + + + + - - - + DockPanel.Dock="Top" + Style="{StaticResource Instructions}" + TextWrapping="Wrap"> + + - - + + - - - - - - + + + + + + - - + + - - - - - - - Import a settings bundle exported from another instance of the app. - - - + + + + Export a settings bundle including managed certificate settings, certificate files and encrypted credentials. + + + + + Import a settings bundle exported from another instance of the app. + + + + - - + + - + - + - + - + - - - + + + - - + + + + diff --git a/src/Certify.UI.Shared/Windows/MainWindow.xaml b/src/Certify.UI.Shared/Windows/MainWindow.xaml index 024e378d3..1d93a12d3 100644 --- a/src/Certify.UI.Shared/Windows/MainWindow.xaml +++ b/src/Certify.UI.Shared/Windows/MainWindow.xaml @@ -1,8 +1,8 @@ - - + - + - + + + + + + + + - - - + + + - - - - + + FontWeight="Bold" + Foreground="White" + Text="Service Running in Degraded Mode" /> + - - - - - - - - - + + - - + - - - - - - - - - - - - - + Orientation="Horizontal" + Visibility="{Binding IsUpdateAvailable, Converter={StaticResource ResourceKey=BoolToVisConverter}}"> + + + - + + + - + - + + + + + + + + + + - - - + SelectedIndex="{Binding MainUITabIndex}"> - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + diff --git a/src/Certify.UI.Shared/Windows/Registration.xaml b/src/Certify.UI.Shared/Windows/Registration.xaml index d4161ea99..a67e06695 100644 --- a/src/Certify.UI.Shared/Windows/Registration.xaml +++ b/src/Certify.UI.Shared/Windows/Registration.xaml @@ -1,8 +1,8 @@ - - + - + - - + + + + + + + + + - - You can purchase a license key by registering at: https://certifytheweb.com/register - + + - - - - - - + + + diff --git a/src/Certify.UI.Shared/Windows/ServerConnections.xaml b/src/Certify.UI.Shared/Windows/ServerConnections.xaml index e58c7707e..229e29dbf 100644 --- a/src/Certify.UI.Shared/Windows/ServerConnections.xaml +++ b/src/Certify.UI.Shared/Windows/ServerConnections.xaml @@ -1,8 +1,8 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + + diff --git a/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml b/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml index 8e29d649c..42d6643d7 100644 --- a/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml +++ b/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml @@ -1,8 +1,8 @@ - - + - - - - New Update Available - - - Current installed version: - + + + + + + + + + + + New Update Available + + + Current installed version: + - + - - - + + + + - - + + + diff --git a/src/Certify.UI/App.xaml b/src/Certify.UI/App.xaml index 450fd8628..1c4a6f961 100644 --- a/src/Certify.UI/App.xaml +++ b/src/Certify.UI/App.xaml @@ -1,96 +1,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Certify.UI/Certify.UI.csproj b/src/Certify.UI/Certify.UI.csproj index 5ac4ff6f2..ddf3212bf 100644 --- a/src/Certify.UI/Certify.UI.csproj +++ b/src/Certify.UI/Certify.UI.csproj @@ -1,184 +1,184 @@ - - - - - Debug - AnyCPU - {C4957629-D567-4934-A193-37B325E7398F} - WinExe - Certify.UI - Certify.UI - v4.6.2 - win-x64 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - false - - PackageReference - true - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - x64 - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\CodeAnalysis.ruleset - - - AnyCPU - win-x64;win - true - bin\Release\ - TRACE;ALPHA - prompt - 4 - false - - - Certify.UI.App - - - icon.ico - - - app.manifest - - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - - App.xaml - Code - - - - - - - - - - - {cec76bb6-5b17-4267-b1ff-5ea0f67eb1c5} - Certify.Client - - - {1efdebe9-468b-4aa0-afd4-1c6d0a321be5} - Certify.Locales - - - {baaa9b8c-e44b-43f6-ac9c-b5666e69ee27} - Certify.Models - - - {fb52bf0a-ac16-40d7-988e-b75a2868871b} - Certify.Shared.Core - - - {e1fcc924-6326-40ac-81bb-c7c235fe8d1f} - Certify.UI.Shared - - - - - - - - - - - False - .NET Framework 3.5 SP1 - false - - - - - 6.9.3 - runtime; build; native; contentfiles; analyzers - all - - - 4.7.0.9 - - - 3.0.0-rc0525 - - - 2.23.0 - - - 2.0.3 - - - 13.0.3 - - - 4.1.0 - all - - - 9.0.9 - - - 4.3.4 - - - 4.6.1 - - - 2.5.1 - - - 2.5.1 - - - - - - - - - - - + + + + + Debug + AnyCPU + {C4957629-D567-4934-A193-37B325E7398F} + WinExe + Certify.UI + Certify.UI + v4.6.2 + win-x64 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + + + false + + PackageReference + true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + x64 + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + ..\CodeAnalysis.ruleset + + + AnyCPU + win-x64;win + true + bin\Release\ + TRACE;ALPHA + prompt + 4 + false + + + Certify.UI.App + + + icon.ico + + + app.manifest + + + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + + App.xaml + Code + + + + + + + + + + + {cec76bb6-5b17-4267-b1ff-5ea0f67eb1c5} + Certify.Client + + + {1efdebe9-468b-4aa0-afd4-1c6d0a321be5} + Certify.Locales + + + {baaa9b8c-e44b-43f6-ac9c-b5666e69ee27} + Certify.Models + + + {fb52bf0a-ac16-40d7-988e-b75a2868871b} + Certify.Shared.Core + + + {e1fcc924-6326-40ac-81bb-c7c235fe8d1f} + Certify.UI.Shared + + + + + + + + + + + False + .NET Framework 3.5 SP1 + false + + + + + 6.9.3 + runtime; build; native; contentfiles; analyzers + all + + + 4.7.0.9 + + + 4.2.1 + + + 2.23.0 + + + 2.0.3 + + + 13.0.3 + + + 4.1.0 + all + + + 9.0.9 + + + 4.3.4 + + + 4.6.1 + + + 2.5.1 + + + 2.5.1 + + + + + + + + + + + \ No newline at end of file