diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj index 84bfe99c..ec960580 100644 --- a/Source/AaxDecrypter/AaxDecrypter.csproj +++ b/Source/AaxDecrypter/AaxDecrypter.csproj @@ -4,10 +4,6 @@ net6.0-windows - - - - embedded @@ -18,6 +14,7 @@ + diff --git a/Source/LibationWinForms/AvaloniaUI/App.axaml.cs b/Source/LibationWinForms/AvaloniaUI/App.axaml.cs index 1f0642bc..82de0d3d 100644 --- a/Source/LibationWinForms/AvaloniaUI/App.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/App.axaml.cs @@ -4,6 +4,7 @@ using Avalonia.Markup.Xaml; using Avalonia.Media; using LibationFileManager; using LibationWinForms.AvaloniaUI.Views; +using System; namespace LibationWinForms.AvaloniaUI { @@ -24,6 +25,10 @@ namespace LibationWinForms.AvaloniaUI { LoadStyles(); + var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/AvaloniaUI/Assets/WINGDING.TTF"), "SEGOEUI_Local")); + var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI); + + if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { var mainWindow = new MainWindow(); diff --git a/Source/LibationWinForms/AvaloniaUI/Assets/SEGOEUI.TTF b/Source/LibationWinForms/AvaloniaUI/Assets/SEGOEUI.TTF new file mode 100644 index 00000000..0f52cbd9 Binary files /dev/null and b/Source/LibationWinForms/AvaloniaUI/Assets/SEGOEUI.TTF differ diff --git a/Source/LibationWinForms/AvaloniaUI/Assets/WINGDING.TTF b/Source/LibationWinForms/AvaloniaUI/Assets/WINGDING.TTF new file mode 100644 index 00000000..6e38f7fd Binary files /dev/null and b/Source/LibationWinForms/AvaloniaUI/Assets/WINGDING.TTF differ diff --git a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml new file mode 100644 index 00000000..119e3aaf --- /dev/null +++ b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml.cs new file mode 100644 index 00000000..b3f359b9 --- /dev/null +++ b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml.cs @@ -0,0 +1,42 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; +using FileManager; +using LibationFileManager; +using System.Collections.Generic; +using System.Collections.ObjectModel; + +namespace LibationWinForms.AvaloniaUI.Views.Dialogs +{ + public partial class EditReplacementChars : DialogWindow + { + Configuration config = Configuration.Instance; + public ObservableCollection replacements { get; } + public EditReplacementChars() + { + InitializeComponent(); + + if (Design.IsDesignMode) + AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists(); + + replacements = new(config.ReplacementCharacters.Replacements); + DataContext = this; + } + + public void Tb_GotFocus(object sender, Avalonia.Input.GotFocusEventArgs e) + { + + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + + + private void LoadTable(IReadOnlyList replacements) + { + + } + } +} diff --git a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml index 198afee3..41601452 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml +++ b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml @@ -65,7 +65,10 @@ - + diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs index 8cfbe6aa..6de9ab7e 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs @@ -67,8 +67,8 @@ namespace LibationWinForms.AvaloniaUI.Views private async void MainWindow_Opened(object sender, EventArgs e) { - var dialog = new EditTemplateDialog(Templates.ChapterFile, ""); - await dialog.ShowDialog(this); + //var dialog = new EditReplacementChars(); + //await dialog.ShowDialog(this); } public void ProductsDisplay_Initialized1(object sender, EventArgs e) diff --git a/Source/LibationWinForms/LibationWinForms.csproj b/Source/LibationWinForms/LibationWinForms.csproj index d2618ec1..d8f85146 100644 --- a/Source/LibationWinForms/LibationWinForms.csproj +++ b/Source/LibationWinForms/LibationWinForms.csproj @@ -39,6 +39,7 @@ <ItemGroup> <AvaloniaResource Include="AvaloniaUI\Assets\**" /> + <AvaloniaResource Remove="AvaloniaUI\Assets\SEGOEUI.TTF" /> <None Remove=".gitignore" /> <None Remove="AvaloniaUI\Assets\Asterisk.png" /> <None Remove="AvaloniaUI\Assets\cancel.png" /> @@ -60,7 +61,9 @@ <None Remove="AvaloniaUI\Assets\MBIcons\Question.png" /> <None Remove="AvaloniaUI\Assets\Question.png" /> <None Remove="AvaloniaUI\Assets\queued.png" /> + <None Remove="AvaloniaUI\Assets\SEGOEUI.TTF" /> <None Remove="AvaloniaUI\Assets\up.png" /> + <None Remove="AvaloniaUI\Assets\WINGDING.TTF" /> </ItemGroup> @@ -151,4 +154,8 @@ <UpToDateCheckInput Remove="AvaloniaUI\Controls\GroupBox.axaml" /> </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="AvaloniaUI\Assets\SEGOEUI.TTF" /> + </ItemGroup> + </Project> \ No newline at end of file