From 58a0468728393901932f140131ca4930cef54b58 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Sun, 11 Dec 2022 16:58:51 -0700 Subject: [PATCH] Tidy up --- .../Dialogs/EditReplacementChars.axaml | 3 +++ .../Dialogs/EditReplacementChars.axaml.cs | 16 ++++--------- .../Dialogs/SearchSyntaxDialog.axaml.cs | 7 ++++-- .../Dialogs/SetupDialog.axaml | 24 +++++++++---------- .../ViewModels/ProductsDisplayViewModel.cs | 7 ++---- .../ViewModels/QueryExtensions.cs | 6 ----- .../Views/MainWindow/MainWindow.axaml.cs | 2 -- 7 files changed, 26 insertions(+), 39 deletions(-) diff --git a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml index 4926794e..e23fb97d 100644 --- a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml +++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml @@ -20,6 +20,9 @@ Name="replacementGrid" AutoGenerateColumns="False" IsReadOnly="False" + BeginningEdit="ReplacementGrid_BeginningEdit" + CellEditEnding="ReplacementGrid_CellEditEnding" + KeyDown="ReplacementGrid_KeyDown" Items="{Binding replacements}"> diff --git a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs index 59c91b25..37ebc208 100644 --- a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs @@ -20,7 +20,6 @@ namespace LibationAvalonia.Dialogs { InitializeComponent(); - replacements = new(SOURCE); if (Design.IsDesignMode) @@ -29,12 +28,6 @@ namespace LibationAvalonia.Dialogs } DataContext = this; - - replacementGrid = this.FindControl(nameof(replacementGrid)); - replacementGrid.BeginningEdit += ReplacementGrid_BeginningEdit; - replacementGrid.CellEditEnding += ReplacementGrid_CellEditEnding; - replacementGrid.KeyDown += ReplacementGrid_KeyDown; - } public EditReplacementChars(Configuration config) : this() @@ -49,11 +42,11 @@ namespace LibationAvalonia.Dialogs => LoadTable(ReplacementCharacters.LoFiDefault.Replacements); public void Barebones_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) => LoadTable(ReplacementCharacters.Barebones.Replacements); - public void Save_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) => SaveAndClose(); public void Cancel_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) => Close(); + protected override void SaveAndClose() { var replacements = SOURCE @@ -65,6 +58,7 @@ namespace LibationAvalonia.Dialogs config.ReplacementCharacters = new ReplacementCharacters { Replacements = replacements }; base.SaveAndClose(); } + private void LoadTable(IReadOnlyList replacements) { SOURCE.Clear(); @@ -73,7 +67,7 @@ namespace LibationAvalonia.Dialogs this.replacements.Refresh(); } - private void ReplacementGrid_KeyDown(object sender, Avalonia.Input.KeyEventArgs e) + public void ReplacementGrid_KeyDown(object sender, Avalonia.Input.KeyEventArgs e) { if (e.Key == Avalonia.Input.Key.Delete && replacementGrid.SelectedItem is ReplacementsExt repl @@ -84,7 +78,7 @@ namespace LibationAvalonia.Dialogs } } - private void ReplacementGrid_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e) + public void ReplacementGrid_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e) { var replacement = e.Row.DataContext as ReplacementsExt; var colBinding = columnBindingPath(e.Column); @@ -111,7 +105,7 @@ namespace LibationAvalonia.Dialogs replacement.PropertyChanged += Replacement_PropertyChanged; } - private void ReplacementGrid_BeginningEdit(object sender, DataGridBeginningEditEventArgs e) + public void ReplacementGrid_BeginningEdit(object sender, DataGridBeginningEditEventArgs e) { var replacement = e.Row.DataContext as ReplacementsExt; diff --git a/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs index 7ea20a55..e05f0da4 100644 --- a/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs @@ -37,10 +37,13 @@ Find books that you haven't rated: " + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchBoolFields()); IdFields = @" -Alice's Adventures in Wonderland (ID: B015D78L0U) +Alice's Adventures in + Wonderland (ID: B015D78L0U) + id:B015D78L0U -All of these are synonyms for the ID field +All of these are synonyms +for the ID field " + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchIdFields()); diff --git a/Source/LibationAvalonia/Dialogs/SetupDialog.axaml b/Source/LibationAvalonia/Dialogs/SetupDialog.axaml index f9a19c13..92a9d968 100644 --- a/Source/LibationAvalonia/Dialogs/SetupDialog.axaml +++ b/Source/LibationAvalonia/Dialogs/SetupDialog.axaml @@ -2,17 +2,17 @@ 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="500" d:DesignHeight="330" - MinWidth="500" MinHeight="330" - MaxWidth="500" MaxHeight="330" + mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="350" + MinWidth="500" MinHeight="350" + MaxWidth="500" MaxHeight="350" x:Class="LibationAvalonia.Dialogs.SetupDialog" WindowStartupLocation="CenterScreen" Icon="/Assets/libation.ico" Title="Welcome to Libation"> - + - -