From c0b1f1dc0a546f55a02fa364fbe6169156b55a89 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Fri, 12 Aug 2022 18:37:02 -0600 Subject: [PATCH] Add useCoverAsFolderIconCb setting to avalonia --- .../Dialogs/SettingsDialog.axaml | 20 ++++++++++++++++--- .../Dialogs/SettingsDialog.axaml.cs | 6 ++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml index 823234de..8468cc15 100644 --- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml +++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml @@ -2,8 +2,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600" - MinWidth="800" MinHeight="600" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="620" + MinWidth="800" MinHeight="620" x:Class="LibationAvalonia.Dialogs.SettingsDialog" xmlns:controls="clr-namespace:LibationAvalonia.Controls" Title="Edit Settings" @@ -206,7 +206,7 @@ BorderThickness="2" BorderBrush="{DynamicResource DataGridGridLinesBrush}"> - + + + + + + + + diff --git a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs index aedb5863..969a2831 100644 --- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs @@ -107,6 +107,7 @@ namespace LibationAvalonia.Dialogs LoadSettings(config); } + public bool IsWindows => AppScaffolding.LibationScaffolding.ReleaseIdentifier is AppScaffolding.ReleaseIdentifier.WindowsAvalonia; public ImportantSettings ImportantSettings { get; private set; } public ImportSettings ImportSettings { get; private set; } public DownloadDecryptSettings DownloadDecryptSettings { get; private set; } @@ -257,6 +258,7 @@ namespace LibationAvalonia.Dialogs InProgressDirectory = config.InProgress == Configuration.AppDir_Absolute ? Configuration.KnownDirectories.AppDir : Configuration.GetKnownDirectory(config.InProgress); + UseCoverAsFolderIcon = config.UseCoverAsFolderIcon; } public async Task SaveSettingsAsync(Configuration config) @@ -294,9 +296,12 @@ namespace LibationAvalonia.Dialogs = InProgressDirectory is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute : Configuration.GetKnownDirectoryPath(InProgressDirectory); + config.UseCoverAsFolderIcon = UseCoverAsFolderIcon; + return true; } + public string UseCoverAsFolderIconText { get; } = Configuration.GetDescription(nameof(Configuration.UseCoverAsFolderIcon)); public string BadBookGroupboxText { get; } = Configuration.GetDescription(nameof(Configuration.BadBook)); public string BadBookAskText { get; } = Configuration.BadBookAction.Ask.GetDescription(); public string BadBookAbortText { get; } = Configuration.BadBookAction.Abort.GetDescription(); @@ -311,6 +316,7 @@ namespace LibationAvalonia.Dialogs public string FolderTemplate { get => _folderTemplate; set { this.RaiseAndSetIfChanged(ref _folderTemplate, value); } } public string FileTemplate { get => _fileTemplate; set { this.RaiseAndSetIfChanged(ref _fileTemplate, value); } } public string ChapterFileTemplate { get => _chapterFileTemplate; set { this.RaiseAndSetIfChanged(ref _chapterFileTemplate, value); } } + public bool UseCoverAsFolderIcon { get; set; } public bool BadBookAsk {