tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MacOS Compatibility

Browse Source
This commit is contained in:
MBucari 2023-04-04 22:25:04 -06:00
parent 6465b0a885
commit 7569b01bd0
6 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/LibationAvalonia/Controls/Settings/Audio.axaml
View File

@ -296,7 +296,6 @@
Grid.Row="4" Grid.Row="4"
Margin="0,5" Margin="0,5"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Foreground="{StaticResource SystemControlDisabledBaseMediumLowBrush}"
Text="Using L.A.M.E encoding engine" Text="Using L.A.M.E encoding engine"
FontStyle="Oblique" /> FontStyle="Oblique" />
</Grid> </Grid>
@ -305,6 +304,7 @@
<controls:GroupBox <controls:GroupBox
Grid.Row="2" Grid.Row="2"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Margin="0,10,0,0"
IsEnabled="{CompiledBinding SplitFilesByChapter}" IsEnabled="{CompiledBinding SplitFilesByChapter}"
Label="{CompiledBinding ChapterTitleTemplateText}"> Label="{CompiledBinding ChapterTitleTemplateText}">

8
Source/LibationAvalonia/Controls/Settings/Audio.axaml.cs
View File

@ -7,8 +7,9 @@ using System.Threading.Tasks;
namespace LibationAvalonia.Controls.Settings namespace LibationAvalonia.Controls.Settings
{ {
public partial class Audio : ReactiveUserControl<AudioSettingsVM> public partial class Audio : UserControl
{ {
private AudioSettingsVM _viewModel => DataContext as AudioSettingsVM;
public Audio() public Audio()
{ {
InitializeComponent(); InitializeComponent();
@ -21,9 +22,10 @@ namespace LibationAvalonia.Controls.Settings
public async void EditChapterTitleTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) public async void EditChapterTitleTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{ {
var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(ViewModel.ChapterTitleTemplate)); if (_viewModel is null) return;
var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(_viewModel.ChapterTitleTemplate));
if (newTemplate is not null) if (newTemplate is not null)
ViewModel.ChapterTitleTemplate = newTemplate; _viewModel.ChapterTitleTemplate = newTemplate;
} }
private async Task<string> editTemplate(ITemplateEditor template) private async Task<string> editTemplate(ITemplateEditor template)

22
Source/LibationAvalonia/Controls/Settings/DownloadDecrypt.axaml.cs
View File

@ -7,8 +7,9 @@ using System.Threading.Tasks;
namespace LibationAvalonia.Controls.Settings namespace LibationAvalonia.Controls.Settings
{ {
public partial class DownloadDecrypt : ReactiveUserControl<DownloadDecryptSettingsVM> public partial class DownloadDecrypt : UserControl
{ {
private DownloadDecryptSettingsVM _viewModel => DataContext as DownloadDecryptSettingsVM;
public DownloadDecrypt() public DownloadDecrypt()
{ {
InitializeComponent(); InitializeComponent();
@ -21,29 +22,32 @@ namespace LibationAvalonia.Controls.Settings
public async void EditFolderTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) public async void EditFolderTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{ {
var newTemplate = await editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(ViewModel.Config.Books, ViewModel.FolderTemplate)); if (_viewModel is null) return;
var newTemplate = await editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(_viewModel.Config.Books, _viewModel.FolderTemplate));
if (newTemplate is not null) if (newTemplate is not null)
ViewModel.FolderTemplate = newTemplate; _viewModel.FolderTemplate = newTemplate;
} }
public async void EditFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) public async void EditFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{ {
var newTemplate = await editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(ViewModel.Config.Books, ViewModel.FileTemplate)); if (_viewModel is null) return;
var newTemplate = await editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(_viewModel.Config.Books, _viewModel.FileTemplate));
if (newTemplate is not null) if (newTemplate is not null)
ViewModel.FileTemplate = newTemplate; _viewModel.FileTemplate = newTemplate;
} }
public async void EditChapterFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) public async void EditChapterFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{ {
if (_viewModel is null) return;
var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(ViewModel.Config.Books, ViewModel.ChapterFileTemplate)); var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(_viewModel.Config.Books, _viewModel.ChapterFileTemplate));
if (newTemplate is not null) if (newTemplate is not null)
ViewModel.ChapterFileTemplate = newTemplate; _viewModel.ChapterFileTemplate = newTemplate;
} }
public async void EditCharReplacementButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) public async void EditCharReplacementButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{ {
var form = new EditReplacementChars(ViewModel.Config); if (_viewModel is null) return;
var form = new EditReplacementChars(_viewModel.Config);
await form.ShowDialog<DialogResult>(this.GetParentWindow()); await form.ShowDialog<DialogResult>(this.GetParentWindow());
} }

2
Source/LibationAvalonia/Controls/Settings/Import.axaml.cs
View File

@ -5,7 +5,7 @@ using LibationFileManager;
namespace LibationAvalonia.Controls.Settings namespace LibationAvalonia.Controls.Settings
{ {
public partial class Import : ReactiveUserControl<ImportSettingsVM> public partial class Import : UserControl
{ {
public Import() public Import()
{ {

3
Source/LibationAvalonia/Controls/Settings/Important.axaml.cs
View File

@ -2,12 +2,13 @@ using Avalonia.Controls;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
using Dinah.Core; using Dinah.Core;
using FileManager; using FileManager;
using LibationAvalonia.ViewModels;
using LibationAvalonia.ViewModels.Settings; using LibationAvalonia.ViewModels.Settings;
using LibationFileManager; using LibationFileManager;
namespace LibationAvalonia.Controls.Settings namespace LibationAvalonia.Controls.Settings
{ {
public partial class Important : ReactiveUserControl<ImportantSettingsVM> public partial class Important : UserControl
{ {
public Important() public Important()
{ {

1
Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
View File

@ -113,6 +113,7 @@
<Button <Button
Grid.Column="0" Grid.Column="0"
Padding="5,5"
Content="Import from audible-cli" Content="Import from audible-cli"
Click="ImportButton_Clicked" /> Click="ImportButton_Clicked" />