Add edit dialog for changing highlight pattern

KyrietS · Oct 20, 2024 · 9e2768f · 9e2768f
1 parent 6e49d3c
commit 9e2768f
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 20 deletions.
diff --git a/src/LogAlligator.App/Controls/BookmarksView.axaml.cs b/src/LogAlligator.App/Controls/BookmarksView.axaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Avalonia.Controls;
 using LogAlligator.App.Utils;
+using Serilog;
 
 namespace LogAlligator.App.Controls;
 

diff --git a/src/LogAlligator.App/Controls/Dialogs/EditHighlightDialog.axaml b/src/LogAlligator.App/Controls/Dialogs/EditHighlightDialog.axaml
@@ -0,0 +1,30 @@
+<Window xmlns="https://github.com/avaloniaui"
+        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"
+        x:Class="LogAlligator.App.Controls.EditHighlightDialog"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Edit highlight"
+        Width="300"
+        Height="95"
+        CanResize="False"
+        ShowInTaskbar="False"
+        ExtendClientAreaChromeHints="NoChrome"
+        ExtendClientAreaToDecorationsHint="True"
+        WindowStartupLocation="CenterOwner"
+        ShowActivated="True">
+    <Window.KeyBindings>
+        <KeyBinding Gesture="Escape" Command="{Binding OnEscape}" />
+    </Window.KeyBindings>
+    <StackPanel Margin="10 5 10 10" Spacing="2">
+        <TextBlock FontSize="{DynamicResource FontSizeNormal}">Edit highlight</TextBlock>
+        <Separator Background="Transparent"/>
+        <TextBox Name="HighlightPatternTextBox" Focusable="True" Watermark="Highlight pattern"/>
+        <Separator Height="6" Background="Transparent"/>
+        <StackPanel Orientation="Horizontal" Spacing="5" HorizontalAlignment="Center">
+            <Button Command="{Binding OnOkClick}" Width="60" IsDefault="True">OK</Button>
+            <Button Command="{Binding OnCancelClick}" Width="60">Cancel</Button>
+        </StackPanel>
+    </StackPanel>
+</Window>
diff --git a/src/LogAlligator.App/Controls/Dialogs/EditHighlightDialog.axaml.cs b/src/LogAlligator.App/Controls/Dialogs/EditHighlightDialog.axaml.cs
@@ -0,0 +1,43 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using LogAlligator.App.Utils;
+
+namespace LogAlligator.App.Controls;
+
+public partial class EditHighlightDialog : Window
+{
+    Highlight? _highlightToEdit = null;
+
+    public EditHighlightDialog()
+    {
+        InitializeComponent();
+    }
+
+    public void Initialize(Highlight highlight)
+    {
+        _highlightToEdit = highlight;
+        HighlightPatternTextBox.Text = highlight.Pattern.Pattern.ToString();
+    }
+
+    public void OnEscape()
+    {
+        Close();
+    }
+
+    public void OnOkClick()
+    {
+        if (!string.IsNullOrEmpty(HighlightPatternTextBox.Text))
+        {
+            _highlightToEdit!.Pattern.Pattern = HighlightPatternTextBox.Text.AsMemory();
+        }
+
+        Close();
+    }
+
+    public void OnCancelClick()
+    {
+        Close();
+    }
+}
diff --git a/src/LogAlligator.App/Controls/HighlightsView.axaml.cs b/src/LogAlligator.App/Controls/HighlightsView.axaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Avalonia.Controls;
 using LogAlligator.App.Utils;
+using Serilog;
 
 namespace LogAlligator.App.Controls;
 
@@ -62,7 +63,7 @@ private List<ListBoxItem> PrepareListOfHighlights()
 
         foreach (var highlight in _highlights ?? [])
         {
-            var item = new ListBoxItem { Content = highlight.ToString(), ContextMenu = BuildContextMenu() };
+            var item = new ListBoxItem { Content = highlight.ToString(), DataContext = highlight, ContextMenu = BuildContextMenu() };
             items.Add(item);
         }
 
@@ -74,8 +75,32 @@ private ContextMenu BuildContextMenu()
         var delete = new MenuItem { Header = "Remove" };
         delete.Click += (_, _) => OnDelete();
 
+        var edit = new MenuItem { Header = "Edit" };
+        edit.Click += (_, _) => EditHighlight();
+
         var contextMenu = new ContextMenu();
+        contextMenu.Items.Add(edit);
         contextMenu.Items.Add(delete);
         return contextMenu;
     }
+
+    private async void EditHighlight()
+    {
+        try
+        {
+            if (ListOfHighlights.SelectedItem is null)
+                return;
+
+            Highlight selectedHighlight = (Highlight)((ListBoxItem)ListOfHighlights.SelectedItem).DataContext!;
+            var dialog = new EditHighlightDialog();
+            dialog.Initialize(selectedHighlight);
+            await dialog.ShowDialog((Window)VisualRoot!);
+
+            _highlights?.ForceRefresh();
+        }
+        catch (Exception)
+        {
+            Log.Warning("Exception caught from edit highlight dialog");
+        }
+    }
 }
diff --git a/src/LogAlligator.App/LogAlligator.App.csproj b/src/LogAlligator.App/LogAlligator.App.csproj
@@ -24,32 +24,18 @@
         <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0-beta1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0-beta1" />
-        
+
         <PackageReference Include="MessageBox.Avalonia" Version="3.1.6" />
         <PackageReference Include="Serilog" Version="4.0.1" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <InternalsVisibleTo Include="LogAlligator.Tests"/>
+        <InternalsVisibleTo Include="LogAlligator.Tests" />
     </ItemGroup>
 
     <ItemGroup>
-        <AvaloniaResource Include="Assets\**"/>
+        <AvaloniaResource Include="Assets\**" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Compile Update="Controls\Dialogs\BookmarkDialog.axaml.cs">
-        <DependentUpon>BookmarkDialog.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-      <Compile Update="Controls\Dialogs\LoadingDataDialog.axaml.cs">
-        <DependentUpon>LoadingDataDialog.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-      <Compile Update="Controls\Dialogs\GrepDialog.axaml.cs">
-        <DependentUpon>GrepDialog.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-    </ItemGroup>
 </Project>
diff --git a/src/LogAlligator.App/Utils/Highlights.cs b/src/LogAlligator.App/Utils/Highlights.cs
@@ -6,10 +6,10 @@
 
 namespace LogAlligator.App.Utils;
 
-public record struct Highlight
+public record class Highlight
 {
     private const double MINIMAL_CONTRAST_RATIO = 7.5;
-    public SearchPattern Pattern { get; set; }
+    public required SearchPattern Pattern { get; set; }
     public Color Background { get; set; }
 
     public bool HasEnoughContrastWith(Color color) => ContrastRatio(Background, color) >= MINIMAL_CONTRAST_RATIO;
@@ -81,6 +81,12 @@ public bool Contains(ReadOnlyMemory<char> pattern)
         return _highlights.Any(h => h.Pattern.Equals(pattern));
     }
 
+    // FIXME: Just use a proper data binding, please...
+    public void ForceRefresh()
+    {
+        OnChange?.Invoke(this, EventArgs.Empty);
+    }
+
     public IEnumerator<Highlight> GetEnumerator()
     {
         return _highlights.GetEnumerator();