From d9bfb1b07456fbd65bc488a42ae961eaf9ff36a4 Mon Sep 17 00:00:00 2001 From: Adrien Allard Date: Sat, 14 Nov 2020 14:26:22 +0100 Subject: [PATCH] Put all colors in a specific resource file. --- Application/FileConverter/Application.xaml | 95 ++++++++++--------- .../Controls/ConversionJobControl.xaml | 2 +- .../EncodingQualitySliderControl.xaml | 10 +- .../EncodingQualitySliderControl.xaml.cs | 1 - .../FileConverter/FileConverter.csproj | 4 + .../FileConverter/Views/Resources/Colors.xaml | 35 +++++++ .../Resources/ConversionPresetTemplates.xaml | 44 ++++----- .../Views/Resources/CustomStyles.xaml | 9 ++ .../FileConverter/Views/SettingsWindow.xaml | 58 +++++------ .../FileConverter/Views/UpgradeWindow.xaml | 6 +- 10 files changed, 153 insertions(+), 111 deletions(-) create mode 100644 Application/FileConverter/Views/Resources/Colors.xaml diff --git a/Application/FileConverter/Application.xaml b/Application/FileConverter/Application.xaml index 0a4644e..9090a61 100644 --- a/Application/FileConverter/Application.xaml +++ b/Application/FileConverter/Application.xaml @@ -9,67 +9,68 @@ xmlns:services="clr-namespace:FileConverter.Services" ShutdownMode="OnLastWindowClose"> - - - - - - + + + + - - + + + + + + - + + - + + + + + - + + + - - - - + + + - - - - - + + + + + - - + + - - - - - + + + + + diff --git a/Application/FileConverter/Controls/ConversionJobControl.xaml b/Application/FileConverter/Controls/ConversionJobControl.xaml index 5f684da..05d7330 100644 --- a/Application/FileConverter/Controls/ConversionJobControl.xaml +++ b/Application/FileConverter/Controls/ConversionJobControl.xaml @@ -57,7 +57,7 @@ -