From ca14468fac6ff1e44441a1aa4b664f4c90f3fdf7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 29 Apr 2026 11:23:19 +0000 Subject: [PATCH 1/4] Port WPF resources to WPF UI Agent-Logs-Url: https://github.com/webprofusion/certify/sessions/dafcf54e-4cad-4b9a-906f-711eb53fe398 Co-authored-by: webprofusion-chrisc <2445502+webprofusion-chrisc@users.noreply.github.com> --- src/Certify.UI.Desktop/App.xaml | 41 +- .../Certify.UI.Shared.csproj | 3 +- .../Controls/GettingStarted.xaml | 10 +- .../ManagedCertificate/AdvancedOptions.xaml | 38 +- .../AuthorityTokenList.xaml | 14 +- .../CertificateIdentifiers.xaml | 45 +-- .../ChallengeConfigItem.xaml | 22 +- .../ManagedCertificate/Dashboard.xaml | 2 +- .../ManagedCertificate/Deployment.xaml | 4 +- .../ManagedCertificate/DeploymentTask.xaml | 27 +- .../IdentifiersAuthorization.xaml | 5 +- .../ManagedCertificateSettings.xaml | 44 +-- .../ManagedCertificateSettings.xaml.cs | 3 +- .../Controls/ManagedCertificate/Preview.xaml | 2 +- .../ManagedCertificate/StatusInfo.xaml | 18 +- .../ManagedCertificate/TabHeader.xaml | 8 +- .../Controls/ManagedCertificate/TaskList.xaml | 8 +- .../Controls/ManagedCertificate/Tasks.xaml | 6 +- .../ManagedCertificate/TestProgress.xaml | 2 +- .../Controls/ManagedCertificates.xaml | 18 +- .../Controls/ProgressMonitor.xaml | 6 +- .../Controls/QuickStart.xaml | 20 +- .../Settings/CertificateAuthorities.xaml | 6 +- .../Controls/Settings/Experiments.xaml | 2 +- .../Controls/Settings/General.xaml | 21 +- .../Controls/Settings/MaintenanceWindows.xaml | 4 +- .../Controls/Settings/ManagementHub.xaml | 12 +- src/Certify.UI.Shared/ICertifyApp.cs | 17 +- .../Utils/ExpiryDateConverter.cs | 4 +- ...ManagedCertificateHealthColourConverter.cs | 2 +- .../Windows/AddToDashboard.xaml | 16 +- .../Windows/DataStoreConnections.xaml | 24 +- .../Windows/EditAccountDialog.xaml | 32 +- .../Windows/EditCertificateAuthority.xaml | 42 +- .../Windows/EditCertificateAuthority.xaml.cs | 2 +- .../Windows/EditCredential.xaml | 24 +- .../Windows/EditDataStoreConnection.xaml | 22 +- .../Windows/EditDeploymentTask.xaml | 14 +- .../Windows/EditMaintenanceWindow.xaml | 36 +- .../Windows/EditServerConnection.xaml | 24 +- src/Certify.UI.Shared/Windows/Feedback.xaml | 18 +- .../Windows/GettingStartedGuide.xaml | 10 +- .../Windows/ImportExport.xaml | 16 +- src/Certify.UI.Shared/Windows/MainWindow.xaml | 59 ++- .../Windows/Registration.xaml | 20 +- .../Windows/ServerConnections.xaml | 14 +- .../Windows/UpdateAvailable.xaml | 18 +- src/Certify.UI/App.xaml | 166 ++++---- src/Certify.UI/Certify.UI.csproj | 366 +++++++++--------- 49 files changed, 598 insertions(+), 739 deletions(-) diff --git a/src/Certify.UI.Desktop/App.xaml b/src/Certify.UI.Desktop/App.xaml index 05f269b45..ce626ec3c 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..f8d48dc78 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,7 @@ Width="220" Margin="0,4,0,8" HorizontalAlignment="Left" - Controls:TextBoxHelper.Watermark="Pfx Unlock Password (if applicable)" + PlaceholderText="Pfx Unlock Password (if applicable)" PasswordChanged="PFXPassword_PasswordChanged" /> @@ -424,7 +418,7 @@ BorderThickness="2" Content="{x:Static Resources:SR.ManagedCertificateSettings_CertificateRevokeWarning}" FontWeight="Bold" - Foreground="{DynamicResource MahApps.Brushes.IdealForeground}" /> + Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}" /> @@ -467,7 +461,7 @@ HorizontalAlignment="Left" Style="{StaticResource Instructions}" Text="Managed Certificate Reference Id:" /> - - - - - @@ -340,7 +337,7 @@ ToolTip="{x:Static Resources:SR.SelectAll}"> @@ -354,7 +351,7 @@ ToolTip="{x:Static Resources:SR.ManagedCertificateSettings_SelectNone}"> @@ -369,13 +366,13 @@ ToolTip="{x:Static Resources:SR.ManagedCertificatesSettings_RefreshDomains}"> - Client ID: - Client Secret: - - + - + @@ -28,7 +26,7 @@ Grid.Column="0" HorizontalAlignment="Left" Content="{x:Static res:SR.RegistrationEmailAddress}" /> - - + diff --git a/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml b/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml index 5fd39d995..6a541649b 100644 --- a/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml +++ b/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml @@ -1,8 +1,8 @@ - @@ -42,14 +40,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="Top"> @@ -71,8 +66,8 @@ - - + + @@ -85,7 +80,7 @@ Click="Connect_Click" CommandParameter="{Binding}" DockPanel.Dock="Left" - Style="{DynamicResource MahApps.Styles.Button.Reveal}" + ToolTip="Select this Data Store"> @@ -135,7 +130,6 @@ @@ -177,7 +171,7 @@ Margin="4,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" - Foreground="{StaticResource MahApps.Brushes.Accent}" + Foreground="{StaticResource AccentFillColorDefaultBrush}" Icon="Database" /> @@ -208,4 +202,4 @@ - + diff --git a/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml b/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml index 3ff3a1e74..e2ff7606f 100644 --- a/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml +++ b/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml @@ -1,8 +1,8 @@ - - + - + @@ -68,7 +63,7 @@ Margin="0,0,8,0" VerticalAlignment="Top" Content="{x:Static res:SR.Email_Address}" /> - @@ -131,12 +125,12 @@ Margin="0,0,8,0" VerticalAlignment="Top" Content="Preferred Chain" /> - @@ -156,7 +150,7 @@ Margin="0,0,8,0" VerticalAlignment="Top" Content="Key Id" /> - - @@ -210,7 +204,7 @@ Margin="0,0,8,0" VerticalAlignment="Top" Content="Account URI" /> - - + diff --git a/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml b/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml index e6e4c896f..adc52ba49 100644 --- a/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml +++ b/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml @@ -1,8 +1,8 @@ - - + - + - @@ -66,12 +64,12 @@ Margin="12,0,0,0" VerticalAlignment="Top" Content="Description" /> - @@ -84,12 +82,12 @@ Margin="12,0,0,0" VerticalAlignment="Top" Content="Production API" /> - @@ -102,12 +100,12 @@ Margin="12,0,0,0" VerticalAlignment="Top" Content="Staging API" /> - @@ -121,12 +119,12 @@ VerticalAlignment="Top" Content="Features" /> - - - - - - + + + + + + @@ -159,4 +157,4 @@ - + diff --git a/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml.cs b/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml.cs index 8a058f2d4..900bb1d80 100644 --- a/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml.cs +++ b/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml.cs @@ -156,7 +156,7 @@ private void OnFeatureToggled(object sender, RoutedEventArgs e) { if (sender != null) { - var s = ((MahApps.Metro.Controls.ToggleSwitch)sender); + var s = ((Wpf.Ui.Controls.ToggleSwitch)sender); var featureTag = s.Tag.ToString(); Model.ToggleFeature(featureTag); diff --git a/src/Certify.UI.Shared/Windows/EditCredential.xaml b/src/Certify.UI.Shared/Windows/EditCredential.xaml index f894de907..1b1f6be3a 100644 --- a/src/Certify.UI.Shared/Windows/EditCredential.xaml +++ b/src/Certify.UI.Shared/Windows/EditCredential.xaml @@ -1,8 +1,8 @@ - - + - + - + @@ -32,9 +30,9 @@ - - @@ -168,4 +166,4 @@ DockPanel.Dock="Right" /> - + diff --git a/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml b/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml index 994865ef0..d3ea0a766 100644 --- a/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml +++ b/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml @@ -1,24 +1,22 @@ - - + - + - @@ -76,12 +74,12 @@ Width="120" Margin="0,0,8,0" Content="Connection String" /> - @@ -113,4 +111,4 @@ - + diff --git a/src/Certify.UI.Shared/Windows/EditDeploymentTask.xaml b/src/Certify.UI.Shared/Windows/EditDeploymentTask.xaml index 4de36a956..24d7a40c5 100644 --- a/src/Certify.UI.Shared/Windows/EditDeploymentTask.xaml +++ b/src/Certify.UI.Shared/Windows/EditDeploymentTask.xaml @@ -1,8 +1,8 @@ - - + - + @@ -48,4 +46,4 @@ VerticalAlignment="Top" DockPanel.Dock="Top" /> - + diff --git a/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml b/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml index 8bde37cbf..996ef3240 100644 --- a/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml +++ b/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml @@ -1,22 +1,20 @@ - @@ -39,19 +37,19 @@ Name - Description - @@ -153,7 +151,7 @@ Start Time (24-hour format) - : - End Time (24-hour format) - : - @@ -227,8 +225,8 @@ Schedule Preview: @@ -241,4 +239,4 @@ - + diff --git a/src/Certify.UI.Shared/Windows/EditServerConnection.xaml b/src/Certify.UI.Shared/Windows/EditServerConnection.xaml index 64722da9a..6a567aa3e 100644 --- a/src/Certify.UI.Shared/Windows/EditServerConnection.xaml +++ b/src/Certify.UI.Shared/Windows/EditServerConnection.xaml @@ -1,8 +1,8 @@ - - + - + @@ -41,12 +39,12 @@ Width="120" Margin="0,0,8,0" Content="Connection Name" /> - @@ -59,7 +57,7 @@ Width="120" Margin="0,0,8,0" Content="Hostname or IP" /> - - @@ -131,4 +129,4 @@ - + diff --git a/src/Certify.UI.Shared/Windows/Feedback.xaml b/src/Certify.UI.Shared/Windows/Feedback.xaml index 334ed3d0f..fbdd7b505 100644 --- a/src/Certify.UI.Shared/Windows/Feedback.xaml +++ b/src/Certify.UI.Shared/Windows/Feedback.xaml @@ -1,8 +1,8 @@ - - + - + - - - + diff --git a/src/Certify.UI.Shared/Windows/GettingStartedGuide.xaml b/src/Certify.UI.Shared/Windows/GettingStartedGuide.xaml index 6a33c0cfb..f44752d2d 100644 --- a/src/Certify.UI.Shared/Windows/GettingStartedGuide.xaml +++ b/src/Certify.UI.Shared/Windows/GettingStartedGuide.xaml @@ -1,8 +1,8 @@ - - + diff --git a/src/Certify.UI.Shared/Windows/ImportExport.xaml b/src/Certify.UI.Shared/Windows/ImportExport.xaml index 922e0b9b4..14f901a62 100644 --- a/src/Certify.UI.Shared/Windows/ImportExport.xaml +++ b/src/Certify.UI.Shared/Windows/ImportExport.xaml @@ -1,18 +1,16 @@ - @@ -24,7 +22,7 @@ x:Name="txtSecret" Width="200" HorizontalAlignment="Left" - Controls:TextBoxHelper.Watermark="Password" /> + PlaceholderText="Password" /> @@ -34,14 +32,11 @@ Margin="0,8,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Stretch" - Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}" - Controls:TabControlHelper.Underlined="TabPanel" DockPanel.Dock="Top" TabStripPlacement="Top"> @@ -59,7 +54,6 @@ Import a settings bundle exported from another instance of the app. @@ -125,4 +119,4 @@ - + diff --git a/src/Certify.UI.Shared/Windows/MainWindow.xaml b/src/Certify.UI.Shared/Windows/MainWindow.xaml index 024e378d3..ec16e32d0 100644 --- a/src/Certify.UI.Shared/Windows/MainWindow.xaml +++ b/src/Certify.UI.Shared/Windows/MainWindow.xaml @@ -1,8 +1,8 @@ - - + - + @@ -57,7 +54,7 @@ @@ -111,7 +108,7 @@ @@ -126,17 +123,17 @@ Height="32" Margin="8,0,0,5" AutomationProperties.Name="{x:Static res:SR.Update_Available}" - Background="{DynamicResource MahApps.Brushes.AccentBase}" + Background="{DynamicResource AccentFillColorDefaultBrush}" Click="ButtonUpdateAvailable_Click" FontWeight="DemiBold" - Foreground="{DynamicResource MahApps.Brushes.SystemControlBackgroundAltMediumHigh}"> + Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"> @@ -182,7 +179,7 @@ @@ -190,12 +187,12 @@ @@ -212,15 +209,12 @@ HorizontalAlignment="Stretch" HorizontalContentAlignment="Left" VerticalContentAlignment="Stretch" - Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}" - Controls:TabControlHelper.Underlined="TabPanel" SelectedIndex="{Binding MainUITabIndex}"> @@ -243,7 +236,6 @@ HorizontalAlignment="Left" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" - Controls:HeaderedControlHelper.HeaderFontSize="12" Header="{x:Static res:SR.Settings}" IsEnabled="{Binding IsServiceAvailable}"> @@ -252,25 +244,20 @@ MinWidth="80" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" - Controls:HeaderedControlHelper.HeaderFontSize="12" Header="{x:Static res:SR.About}"> - - - - - + + - - + - - - + Placement="Right" + /> + + + diff --git a/src/Certify.UI.Shared/Windows/Registration.xaml b/src/Certify.UI.Shared/Windows/Registration.xaml index d4161ea99..1495327f3 100644 --- a/src/Certify.UI.Shared/Windows/Registration.xaml +++ b/src/Certify.UI.Shared/Windows/Registration.xaml @@ -1,8 +1,8 @@ - - + - + @@ -40,7 +38,7 @@ HorizontalAlignment="Left" VerticalAlignment="Top" Content="{x:Static res:SR.RegistrationEmailAddress}" /> - - - - + diff --git a/src/Certify.UI.Shared/Windows/ServerConnections.xaml b/src/Certify.UI.Shared/Windows/ServerConnections.xaml index e58c7707e..0c5adf724 100644 --- a/src/Certify.UI.Shared/Windows/ServerConnections.xaml +++ b/src/Certify.UI.Shared/Windows/ServerConnections.xaml @@ -1,8 +1,8 @@ - @@ -48,7 +46,7 @@ @@ -67,7 +65,7 @@ @@ -120,4 +118,4 @@ - + diff --git a/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml b/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml index 8e29d649c..a7fd664b6 100644 --- a/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml +++ b/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml @@ -1,8 +1,8 @@ - - + - + Download @@ -71,11 +69,11 @@ Later - + diff --git a/src/Certify.UI/App.xaml b/src/Certify.UI/App.xaml index 450fd8628..ce626ec3c 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 From 468c1a854fb9d90bb48044ecd9fff1337ef1adba Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 29 Apr 2026 11:27:15 +0000 Subject: [PATCH 2/4] Complete WPF UI control migration Agent-Logs-Url: https://github.com/webprofusion/certify/sessions/dafcf54e-4cad-4b9a-906f-711eb53fe398 Co-authored-by: webprofusion-chrisc <2445502+webprofusion-chrisc@users.noreply.github.com> --- eula.txt | 6 +++--- .../THIRD_PARTY_LICENSES.txt | 6 +++--- .../plugins/THIRD_PARTY_LICENSES.txt | 6 +++--- .../ManagedCertificate/AdvancedOptions.xaml | 3 +-- .../CertificateIdentifiers.xaml | 1 - .../ManagedCertificateSettings.xaml | 5 ++--- .../ManagedCertificateSettings.xaml.cs | 4 ++-- .../ManagedCertificate/StatusInfo.xaml | 1 + .../Controls/ProgressMonitor.xaml | 1 + .../Controls/QuickStart.xaml | 20 +++++++++---------- .../Controls/Settings/General.xaml | 7 +++---- src/Certify.UI.Shared/ICertifyApp.cs | 9 ++++----- .../Windows/EditMaintenanceWindow.xaml.cs | 2 +- .../Windows/ImportExport.xaml | 4 ++-- .../Windows/UpdateAvailable.xaml | 2 -- 15 files changed, 35 insertions(+), 42 deletions(-) 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.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml index f8d48dc78..7c9394296 100644 --- a/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml +++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml @@ -293,7 +293,7 @@ VerticalScrollBarVisibility="Auto"> - + @@ -373,7 +373,6 @@ Width="220" Margin="0,4,0,8" HorizontalAlignment="Left" - PlaceholderText="Pfx Unlock Password (if applicable)" PasswordChanged="PFXPassword_PasswordChanged" /> diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml index 9fd92d6e0..d49e363cd 100644 --- a/src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml +++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml @@ -103,7 +103,6 @@ diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml index a9bd8fac0..b253efe66 100644 --- a/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml +++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml @@ -223,12 +223,11 @@ Visibility="{Binding SelectedItem, Converter={StaticResource ResourceKey=NullCollapsedConverter}}"> - @@ -295,7 +294,7 @@ - + diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs b/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs index da7bcc971..e5a28589e 100644 --- a/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs +++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs @@ -6,7 +6,7 @@ using Certify.Locales; using Certify.Models; using Certify.UI.Shared; -using Wpf.Ui.Controls; +using WpfFlyout = Wpf.Ui.Controls.Flyout; namespace Certify.UI.Controls.ManagedCertificate { @@ -248,7 +248,7 @@ private void ShowTestResultsUI() { var parentWindow = Window.GetWindow(this); var obj = parentWindow.FindName("MainFlyout"); - var flyout = (Flyout)obj; + var flyout = (WpfFlyout)obj; flyout.Content = new TestProgress(); flyout.IsOpen = !flyout.IsOpen; } diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/StatusInfo.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/StatusInfo.xaml index 74e8c5352..65414be6e 100644 --- a/src/Certify.UI.Shared/Controls/ManagedCertificate/StatusInfo.xaml +++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/StatusInfo.xaml @@ -2,6 +2,7 @@ x:Class="Certify.UI.Controls.ManagedCertificate.StatusInfo" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + 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" diff --git a/src/Certify.UI.Shared/Controls/ProgressMonitor.xaml b/src/Certify.UI.Shared/Controls/ProgressMonitor.xaml index 921763f95..c9125fa8d 100644 --- a/src/Certify.UI.Shared/Controls/ProgressMonitor.xaml +++ b/src/Certify.UI.Shared/Controls/ProgressMonitor.xaml @@ -2,6 +2,7 @@ x:Class="Certify.UI.Controls.ProgressMonitor" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + 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/" diff --git a/src/Certify.UI.Shared/Controls/QuickStart.xaml b/src/Certify.UI.Shared/Controls/QuickStart.xaml index f90ce6d5b..44125667d 100644 --- a/src/Certify.UI.Shared/Controls/QuickStart.xaml +++ b/src/Certify.UI.Shared/Controls/QuickStart.xaml @@ -9,13 +9,11 @@ mc:Ignorable="d"> - + Margin="16"> - + - - + + - - + + - + - + \ No newline at end of file diff --git a/src/Certify.UI.Shared/Controls/Settings/General.xaml b/src/Certify.UI.Shared/Controls/Settings/General.xaml index 39527e3aa..9bfabb61b 100644 --- a/src/Certify.UI.Shared/Controls/Settings/General.xaml +++ b/src/Certify.UI.Shared/Controls/Settings/General.xaml @@ -51,7 +51,7 @@ Width="100" Margin="8,0,0,4" HorizontalAlignment="Left" - Interval="1" + SmallChange="1" Maximum="60" Minimum="1" Value="{Binding Prefs.RenewalIntervalDays}" /> @@ -98,7 +98,7 @@ Width="100" Margin="4,0,0,0" HorizontalAlignment="Left" - Interval="1" + SmallChange="1" Maximum="100" Minimum="0" Value="{Binding Prefs.MaxRenewalRequests}" /> @@ -447,10 +447,9 @@ diff --git a/src/Certify.UI.Shared/ICertifyApp.cs b/src/Certify.UI.Shared/ICertifyApp.cs index b398085ed..4272fc76f 100644 --- a/src/Certify.UI.Shared/ICertifyApp.cs +++ b/src/Certify.UI.Shared/ICertifyApp.cs @@ -6,7 +6,6 @@ using ToastNotifications.Messages; using ToastNotifications.Position; using Wpf.Ui.Appearance; -using Wpf.Ui.Controls; namespace Certify.UI.Shared { @@ -39,11 +38,11 @@ public static string ToggleTheme(System.Windows.Application application, Certify { if (initialTheme == "Dark") { - ApplicationThemeManager.Apply(ApplicationTheme.Dark, WindowBackdropType.Mica, true); + ApplicationThemeManager.Apply(ApplicationTheme.Dark, Wpf.Ui.Controls.WindowBackdropType.Mica, true); } else { - ApplicationThemeManager.Apply(ApplicationTheme.Light, WindowBackdropType.Mica, true); + ApplicationThemeManager.Apply(ApplicationTheme.Light, Wpf.Ui.Controls.WindowBackdropType.Mica, true); } // refresh bindings to force dynamic resources to redraw @@ -57,12 +56,12 @@ public static string ToggleTheme(System.Windows.Application application, Certify if (theme == ApplicationTheme.Light) { - ApplicationThemeManager.Apply(ApplicationTheme.Dark, WindowBackdropType.Mica, true); + ApplicationThemeManager.Apply(ApplicationTheme.Dark, Wpf.Ui.Controls.WindowBackdropType.Mica, true); themeSelection = "Dark"; } else { - ApplicationThemeManager.Apply(ApplicationTheme.Light, WindowBackdropType.Mica, true); + ApplicationThemeManager.Apply(ApplicationTheme.Light, Wpf.Ui.Controls.WindowBackdropType.Mica, true); themeSelection = "Light"; } 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/ImportExport.xaml b/src/Certify.UI.Shared/Windows/ImportExport.xaml index 14f901a62..2caf69a4c 100644 --- a/src/Certify.UI.Shared/Windows/ImportExport.xaml +++ b/src/Certify.UI.Shared/Windows/ImportExport.xaml @@ -22,7 +22,7 @@ x:Name="txtSecret" Width="200" HorizontalAlignment="Left" - PlaceholderText="Password" /> + /> @@ -91,7 +91,7 @@ - From 8321a2420f3afe39c2480817eda8f87626d64777 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 29 Apr 2026 11:33:29 +0000 Subject: [PATCH 3/4] Preserve UI scaling decimal input Agent-Logs-Url: https://github.com/webprofusion/certify/sessions/dafcf54e-4cad-4b9a-906f-711eb53fe398 Co-authored-by: webprofusion-chrisc <2445502+webprofusion-chrisc@users.noreply.github.com> --- src/Certify.UI.Shared/Controls/Settings/General.xaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Certify.UI.Shared/Controls/Settings/General.xaml b/src/Certify.UI.Shared/Controls/Settings/General.xaml index 9bfabb61b..4e55d6734 100644 --- a/src/Certify.UI.Shared/Controls/Settings/General.xaml +++ b/src/Certify.UI.Shared/Controls/Settings/General.xaml @@ -450,6 +450,7 @@ SmallChange="0.1" Maximum="2" Minimum="1" + MaxDecimalPlaces="1" Value="{Binding MainViewModel.UIScaleFactor}" /> From 9d6e8a26d53091e8a0ff5738e4d1c17ba83fd0ec Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 29 Apr 2026 12:20:57 +0000 Subject: [PATCH 4/4] Restore WPF UI title bars and theme dictionaries Agent-Logs-Url: https://github.com/webprofusion/certify/sessions/c080f9ef-83aa-4383-b6e0-689ab3262642 Co-authored-by: webprofusion-chrisc <2445502+webprofusion-chrisc@users.noreply.github.com> --- src/Certify.UI.Desktop/App.xaml | 4 +- .../Windows/AddToDashboard.xaml | 98 ++-- .../Windows/DataStoreConnections.xaml | 372 +++++++------- .../Windows/EditAccountDialog.xaml | 472 +++++++++--------- .../Windows/EditCertificateAuthority.xaml | 280 ++++++----- .../Windows/EditCredential.xaml | 182 +++---- .../Windows/EditDataStoreConnection.xaml | 186 +++---- .../Windows/EditDeploymentTask.xaml | 64 ++- .../Windows/EditMaintenanceWindow.xaml | 438 ++++++++-------- .../Windows/EditServerConnection.xaml | 206 ++++---- src/Certify.UI.Shared/Windows/Feedback.xaml | 116 +++-- .../Windows/GettingStartedGuide.xaml | 20 +- .../Windows/ImportExport.xaml | 192 +++---- src/Certify.UI.Shared/Windows/MainWindow.xaml | 406 +++++++-------- .../Windows/Registration.xaml | 194 +++---- .../Windows/ServerConnections.xaml | 210 ++++---- .../Windows/UpdateAvailable.xaml | 114 +++-- src/Certify.UI/App.xaml | 4 +- 18 files changed, 1891 insertions(+), 1667 deletions(-) diff --git a/src/Certify.UI.Desktop/App.xaml b/src/Certify.UI.Desktop/App.xaml index ce626ec3c..1c4a6f961 100644 --- a/src/Certify.UI.Desktop/App.xaml +++ b/src/Certify.UI.Desktop/App.xaml @@ -8,8 +8,8 @@ - - + + diff --git a/src/Certify.UI.Shared/Windows/AddToDashboard.xaml b/src/Certify.UI.Shared/Windows/AddToDashboard.xaml index ac276ce8d..6e8184e4e 100644 --- a/src/Certify.UI.Shared/Windows/AddToDashboard.xaml +++ b/src/Certify.UI.Shared/Windows/AddToDashboard.xaml @@ -11,56 +11,70 @@ Width="430" Height="288" Background="{DynamicResource ApplicationBackgroundBrush}" + WindowBackdropType="Mica" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" mc:Ignorable="d"> - + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + diff --git a/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml b/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml index e2ff7606f..e7a0bfd56 100644 --- a/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml +++ b/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml @@ -11,275 +11,289 @@ Width="590" Height="480" Background="{DynamicResource ApplicationBackgroundBrush}" + WindowBackdropType="Mica" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" ResizeMode="CanResizeWithGrip" WindowStartupLocation="CenterOwner" mc:Ignorable="d"> - + + + + + + + + - - - - - - - - - - - - - - + + + - - - - - - - - - - - - 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/EditServerConnection.xaml b/src/Certify.UI.Shared/Windows/EditServerConnection.xaml index 6a567aa3e..ecbc6513a 100644 --- a/src/Certify.UI.Shared/Windows/EditServerConnection.xaml +++ b/src/Certify.UI.Shared/Windows/EditServerConnection.xaml @@ -12,6 +12,9 @@ Width="540" Height="320" Background="{DynamicResource ApplicationBackgroundBrush}" + WindowBackdropType="Mica" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" ResizeMode="CanResizeWithGrip" WindowStartupLocation="CenterOwner" mc:Ignorable="d"> @@ -20,113 +23,124 @@ - + + + + + + + + - - - + 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 ec16e32d0..1d93a12d3 100644 --- a/src/Certify.UI.Shared/Windows/MainWindow.xaml +++ b/src/Certify.UI.Shared/Windows/MainWindow.xaml @@ -19,6 +19,9 @@ d:DataContext="{d:DesignInstance Type=local:AppViewModelDesign, IsDesignTimeCreatable=True}" Background="{DynamicResource ApplicationBackgroundBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + WindowBackdropType="Mica" + ExtendsContentIntoTitleBar="True" Closing="MetroWindow_Closing" Loaded="Window_Loaded" mc:Ignorable="d"> @@ -30,234 +33,245 @@ - + + + + + + + + - - - + + + - - - - + + 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 1495327f3..a67e06695 100644 --- a/src/Certify.UI.Shared/Windows/Registration.xaml +++ b/src/Certify.UI.Shared/Windows/Registration.xaml @@ -12,6 +12,9 @@ Width="421.946" Height="255.15" Background="{DynamicResource ApplicationBackgroundBrush}" + WindowBackdropType="Mica" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + ExtendsContentIntoTitleBar="True" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" mc:Ignorable="d"> @@ -20,103 +23,114 @@ - - + + + + + + + + + - - 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 0c5adf724..229e29dbf 100644 --- a/src/Certify.UI.Shared/Windows/ServerConnections.xaml +++ b/src/Certify.UI.Shared/Windows/ServerConnections.xaml @@ -11,111 +11,125 @@ Width="384" Height="500" Background="{DynamicResource ApplicationBackgroundBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + WindowBackdropType="Mica" + ExtendsContentIntoTitleBar="True" Closing="MetroWindow_Closing" WindowStartupLocation="CenterOwner" mc:Ignorable="d"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + + diff --git a/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml b/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml index c0be0a063..42d6643d7 100644 --- a/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml +++ b/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml @@ -15,63 +15,77 @@ MinWidth="300" MinHeight="300" Background="{DynamicResource ApplicationBackgroundBrush}" + Foreground="{DynamicResource TextFillColorPrimaryBrush}" + WindowBackdropType="Mica" + ExtendsContentIntoTitleBar="True" IsVisibleChanged="UserControl_IsVisibleChanged" WindowStartupLocation="CenterOwner" mc:Ignorable="d"> - - - 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 ce626ec3c..1c4a6f961 100644 --- a/src/Certify.UI/App.xaml +++ b/src/Certify.UI/App.xaml @@ -8,8 +8,8 @@ - - + +