From 807725f6ffe0295702fefe2d7b2ea47ba6edb21c Mon Sep 17 00:00:00 2001
From: MBucari <mbucari1@gmail.com>
Date: Mon, 27 Mar 2023 19:40:23 -0600
Subject: [PATCH] Replace editable DataGridTextColumn with TextBox (#552)

---
 .../Controls/DataGridContextMenus.cs          |  2 +-
 .../Dialogs/AccountsDialog.axaml              | 24 ++++++++-----
 .../Dialogs/AccountsDialog.axaml.cs           |  3 +-
 .../Dialogs/EditQuickFilters.axaml            | 15 ++++----
 .../Dialogs/EditReplacementChars.axaml        | 36 ++++++++++++-------
 Source/LibationAvalonia/Walkthrough.cs        |  4 +--
 Source/LibationWinForms/Walkthrough.cs        |  4 +--
 7 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/Source/LibationAvalonia/Controls/DataGridContextMenus.cs b/Source/LibationAvalonia/Controls/DataGridContextMenus.cs
index d7916b76..60e939cf 100644
--- a/Source/LibationAvalonia/Controls/DataGridContextMenus.cs
+++ b/Source/LibationAvalonia/Controls/DataGridContextMenus.cs
@@ -66,6 +66,6 @@ namespace LibationAvalonia.Controls
 		public IGridEntry GridEntry { get; init; }
 		public ContextMenu ContextMenu { get; init; }
 		public AvaloniaList<Control> ContextMenuItems
-			=> ContextMenu.Items as AvaloniaList<Control>;
+			=> ContextMenu.ItemsSource as AvaloniaList<Control>;
 	}
 }
diff --git a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
index 07647a43..cb88ce89 100644
--- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
@@ -64,11 +64,14 @@
 				<DataGridCheckBoxColumn
 					Binding="{Binding LibraryScan, Mode=TwoWay}"
 					Header="Include in&#xa;library scan?"/>
-
-				<DataGridTextColumn
-					Width="2*"
-					Binding="{Binding AccountId, Mode=TwoWay}"
-					Header="Audible&#xa;email/login"/>
+				
+				<DataGridTemplateColumn Width="2*" Header="Audible&#xa;email/login">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox Text="{Binding AccountId, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
 				<DataGridTemplateColumn Width="Auto" Header="Locale">
 					<DataGridTemplateColumn.CellTemplate>
@@ -93,10 +96,13 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 
-				<DataGridTextColumn
-					Width="3*"
-					Binding="{Binding AccountName, Mode=TwoWay}"
-					Header="Account Nickname&#xa;(optional)"/>
+				<DataGridTemplateColumn Width="3*" Header="Account Nickname&#xa;(optional)">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox Text="{Binding AccountName, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
 			</DataGrid.Columns>
 		</DataGrid>
diff --git a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs
index 946b62e0..6353c5c3 100644
--- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs
@@ -1,5 +1,6 @@
 using AudibleApi;
 using AudibleUtilities;
+using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using ReactiveUI;
@@ -14,7 +15,7 @@ namespace LibationAvalonia.Dialogs
 {
 	public partial class AccountsDialog : DialogWindow
 	{
-		public ObservableCollection<AccountDto> Accounts { get; } = new();
+		public AvaloniaList<AccountDto> Accounts { get; } = new();
 		public class AccountDto : ViewModels.ViewModelBase
 		{
 			private string _accountId;
diff --git a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
index d10beafc..1890818a 100644
--- a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
@@ -42,13 +42,16 @@
 
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>				
+				</DataGridTemplateColumn>
+				
+				<DataGridTemplateColumn Width="*" Header="Filter">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox Text="{Binding FilterString, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
-				<DataGridTextColumn
-					Width="*"
-					IsReadOnly="False"
-					Binding="{Binding FilterString, Mode=TwoWay}"
-					Header="Filter"/>
 
 				<DataGridTemplateColumn Header="Move&#xa;Up">
 					<DataGridTemplateColumn.CellTemplate>
diff --git a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
index 0fbd9f70..202a2a7a 100644
--- a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
@@ -27,21 +27,31 @@
 			Items="{Binding replacements}">
 
 			<DataGrid.Columns>
+
+
+				<DataGridTemplateColumn Header="Char to&#xa;Replace">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox IsReadOnly="{Binding Mandatory}" Text="{Binding CharacterToReplace, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 				
-				<DataGridTextColumn
-					IsReadOnly="False"
-					Binding="{Binding CharacterToReplace, Mode=TwoWay}"
-					Header="Char to&#xa;Replace"/>
+				<DataGridTemplateColumn Header="Replacement&#xa;Text">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox Text="{Binding ReplacementText, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
-				<DataGridTextColumn
-					IsReadOnly="False"
-					Binding="{Binding ReplacementText, Mode=TwoWay}"
-					Header="Replacement&#xa;Text"/>
-
-				<DataGridTextColumn Width="*"
-					IsReadOnly="False"
-					Binding="{Binding Description, Mode=TwoWay}"
-					Header="Description"/>
+				<DataGridTemplateColumn Width="*" Header="Description">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox IsReadOnly="{Binding Mandatory}" Text="{Binding Description, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
 			</DataGrid.Columns>
 		</DataGrid>
diff --git a/Source/LibationAvalonia/Walkthrough.cs b/Source/LibationAvalonia/Walkthrough.cs
index 99823e63..6e2cab38 100644
--- a/Source/LibationAvalonia/Walkthrough.cs
+++ b/Source/LibationAvalonia/Walkthrough.cs
@@ -80,7 +80,7 @@ namespace LibationAvalonia
 
 					if (!selectedTab.IsVisible || !(selectedTab.Header is TextBlock header && settingTabMessages.ContainsKey(header.Text))) return;
 
-					await MessageBox.Show(settingsDialog, settingTabMessages[header.Text], header.Text + " Tab", MessageBoxButtons.OK, MessageBoxIcon.Information);
+					await MessageBox.Show(settingsDialog, settingTabMessages[header.Text], header.Text + " Tab", MessageBoxButtons.OK);
 
 					settingTabMessages.Remove(header.Text);
 				}
@@ -106,7 +106,7 @@ namespace LibationAvalonia
 
 			if (count < 1)
 			{
-				await Dispatcher.UIThread.InvokeAsync(() => MessageBox.Show(MainForm, "Add an Audible account, then sync your library through the \"Import\" menu", "Add an Audible Account"));
+				await Dispatcher.UIThread.InvokeAsync(() => MessageBox.Show(MainForm, "Add an Audible account, then sync your library through the \"Import\" menu", "Add an Audible Account", MessageBoxButtons.OK, MessageBoxIcon.Information));
 				return false;
 			}
 
diff --git a/Source/LibationWinForms/Walkthrough.cs b/Source/LibationWinForms/Walkthrough.cs
index 4cf98ee8..db7d610e 100644
--- a/Source/LibationWinForms/Walkthrough.cs
+++ b/Source/LibationWinForms/Walkthrough.cs
@@ -79,7 +79,7 @@ namespace LibationWinForms
 
 				if (!selectedTab.Visible || !settingTabMessages.ContainsKey(selectedTab.Text)) return;
 
-				MessageBox.Show(selectedTab, settingTabMessages[selectedTab.Text], selectedTab.Text + " Tab", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				MessageBox.Show(selectedTab, settingTabMessages[selectedTab.Text], selectedTab.Text + " Tab", MessageBoxButtons.OK);
 
 				settingTabMessages.Remove(selectedTab.Text);
 			}
@@ -104,7 +104,7 @@ namespace LibationWinForms
 
 			if (count < 1)
 			{
-				MainForm.Invoke(() => MessageBox.Show(MainForm, "Add an Audible account, then sync your library through the \"Import\" menu", "Add an Audible Account"));
+				MainForm.Invoke(() => MessageBox.Show(MainForm, "Add an Audible account, then sync your library through the \"Import\" menu", "Add an Audible Account", MessageBoxButtons.OK, MessageBoxIcon.Information));
 				return false;
 			}