418 gui design highlighting unreadable color

.github/workflows/test_dotnet.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
       working-directory: src

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.101"
+    "version": "9.0.301"
   }
-}
+}

src/ColumnizerLib/Extensions/LogLineExtensions.cs

@@ -1,4 +1,4 @@
-namespace LogExpert.Extensions;
+namespace LogExpert.Extensions;
 
 //TODO: Move this to LogExpert.UI, change to internal and fix tests
 public static class LogLineExtensions

src/ColumnizerLib/ITextValue.cs

@@ -1,4 +1,4 @@
-namespace LogExpert;
+namespace LogExpert;
 
 public interface ITextValue
 {

src/LogExpert.Core/Classes/Log/LogfileReader.cs

@@ -1785,13 +1785,13 @@ private void DumpBufferInfos (LogBuffer buffer)
 
     #endregion
 
-    public void Dispose()
+    public void Dispose ()
     {
         Dispose(true);
         GC.SuppressFinalize(this); // Suppress finalization (not needed but best practice)
     }
 
-    protected virtual void Dispose(bool disposing)
+    protected virtual void Dispose (bool disposing)
     {
         if (!_disposed)
         {
@@ -1808,7 +1808,7 @@ protected virtual void Dispose(bool disposing)
     //TODO: Seems that this can be deleted. Need to verify.
     ~LogfileReader ()
     {
-        Dispose (false);
+        Dispose(false);
     }
 
     protected virtual void OnFileSizeChanged (LogEventArgs e)

src/LogExpert.Core/Classes/SpreadEntry.cs

@@ -1,4 +1,4 @@
-namespace LogExpert.Core.Classes;
+namespace LogExpert.Core.Classes;
 
 public class SpreadEntry
 {
@@ -16,7 +16,7 @@ public class SpreadEntry
 
     #region cTor
 
-    public SpreadEntry(int lineNum, int diff, DateTime timestamp)
+    public SpreadEntry (int lineNum, int diff, DateTime timestamp)
     {
         LineNum = lineNum;
         Diff = diff;

src/LogExpert.Core/Config/ColorEntry.cs

@@ -7,23 +7,9 @@
 namespace LogExpert.Core.Config;
 
 [Serializable]
-public class ColorEntry
+public class ColorEntry (string FileName, Color Color)
 {
-    #region cTor
+    public Color Color { get; } = Color;
 
-    public ColorEntry(string fileName, Color color)
-    {
-        FileName = fileName;
-        Color = color;
-    }
-
-    #endregion
-
-    public Color Color { get; }
-
-    public string FileName { get; }
-
-    #region Fields
-
-    #endregion
+    public string FileName { get; } = FileName;
 }

src/LogExpert.Core/Config/Settings.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 
 using LogExpert.Core.Classes.Filter;
-using LogExpert.Core.Entities;
+using LogExpert.Entities;
 
 namespace LogExpert.Core.Config;
 

src/LogExpert.Core/Entities/SearchParams.cs

@@ -1,4 +1,4 @@
-namespace LogExpert.Core.Entities;
+namespace LogExpert.Entities;
 
 [Serializable]
 public class SearchParams

src/LogExpert.Core/EventArguments/BookmarkEventArgs.cs

@@ -1,8 +1,8 @@
-using LogExpert.Core.Entities;
+using LogExpert.Core.Entities;
 
 namespace LogExpert.Core.EventArguments;
 
-public class BookmarkEventArgs(Bookmark bookmark) : System.EventArgs
+public class BookmarkEventArgs (Bookmark bookmark) : EventArgs
 {
     #region Properties
 

src/LogExpert.UI/Controls/BufferedDataGridView.cs

@@ -18,13 +18,13 @@ internal partial class BufferedDataGridView : DataGridView
     private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
     private readonly Brush _brush;
 
-    private readonly Color _bubbleColor = Color.FromArgb(160, 250, 250, 0);
+    private readonly Color _bubbleColor = Color.FromArgb(160, 250, 250, 0); //yellow
     private readonly Font _font = new("Arial", 10);
 
     private readonly SortedList<int, BookmarkOverlay> _overlayList = [];
 
     private readonly Pen _pen;
-    private readonly Brush _textBrush = new SolidBrush(Color.FromArgb(200, 0, 0, 90));
+    private readonly Brush _textBrush = new SolidBrush(Color.FromArgb(200, 0, 0, 90)); //dark blue
 
     private BookmarkOverlay _draggedOverlay;
     private Point _dragStartPoint;
@@ -47,15 +47,9 @@ public BufferedDataGridView ()
 
     #endregion
 
-    #region Delegates
-
-    public delegate void OverlayDoubleClickedEventHandler (object sender, OverlayEventArgs e);
-
-    #endregion
-
     #region Events
 
-    public event OverlayDoubleClickedEventHandler OverlayDoubleClicked;
+    public event EventHandler<OverlayEventArgs> OverlayDoubleClicked;
 
     #endregion
 
@@ -113,15 +107,15 @@ protected override void OnEditingControlShowing (DataGridViewEditingControlShowi
         e.Control.KeyDown -= OnControlKeyDown;
         e.Control.KeyDown += OnControlKeyDown;
         var editControl = (DataGridViewTextBoxEditingControl)e.Control;
-        e.Control.PreviewKeyDown -= Control_PreviewKeyDown;
-        e.Control.PreviewKeyDown += Control_PreviewKeyDown;
+        e.Control.PreviewKeyDown -= OnControlPreviewKeyDown;
+        e.Control.PreviewKeyDown += OnControlPreviewKeyDown;
 
         editControl.ContextMenuStrip = EditModeMenuStrip;
     }
 
     protected override void OnMouseDown (MouseEventArgs e)
     {
-        BookmarkOverlay overlay = GetOverlayForPosition(e.Location);
+        var overlay = GetOverlayForPosition(e.Location);
         if (overlay != null)
         {
             if (e.Button == MouseButtons.Right)
@@ -172,15 +166,15 @@ protected override void OnMouseMove (MouseEventArgs e)
         }
         else
         {
-            BookmarkOverlay overlay = GetOverlayForPosition(e.Location);
+            var overlay = GetOverlayForPosition(e.Location);
             Cursor = overlay != null ? Cursors.Hand : Cursors.Default;
             base.OnMouseMove(e);
         }
     }
 
     protected override void OnMouseDoubleClick (MouseEventArgs e)
     {
-        BookmarkOverlay overlay = GetOverlayForPosition(e.Location);
+        var overlay = GetOverlayForPosition(e.Location);
         if (overlay != null)
         {
             if (e.Button == MouseButtons.Left)
@@ -202,7 +196,7 @@ private BookmarkOverlay GetOverlayForPosition (Point pos)
     {
         lock (_overlayList)
         {
-            foreach (BookmarkOverlay overlay in _overlayList.Values)
+            foreach (var overlay in _overlayList.Values)
             {
                 if (overlay.BubbleRect.Contains(pos))
                 {
@@ -216,9 +210,9 @@ private BookmarkOverlay GetOverlayForPosition (Point pos)
 
     private void PaintOverlays (PaintEventArgs e)
     {
-        BufferedGraphicsContext currentContext = BufferedGraphicsManager.Current;
+        var currentContext = BufferedGraphicsManager.Current;
 
-        using BufferedGraphics myBuffer = currentContext.Allocate(CreateGraphics(), ClientRectangle);
+        using var myBuffer = currentContext.Allocate(CreateGraphics(), ClientRectangle);
         lock (_overlayList)
         {
             _overlayList.Clear();
@@ -247,9 +241,9 @@ private void PaintOverlays (PaintEventArgs e)
 
         lock (_overlayList)
         {
-            foreach (BookmarkOverlay overlay in _overlayList.Values)
+            foreach (var overlay in _overlayList.Values)
             {
-                SizeF textSize = myBuffer.Graphics.MeasureString(overlay.Bookmark.Text, _font, 300);
+                var textSize = myBuffer.Graphics.MeasureString(overlay.Bookmark.Text, _font, 300);
                 Rectangle rectBubble = new(overlay.Position, new Size((int)textSize.Width, (int)textSize.Height));
                 rectBubble.Offset(60, -(rectBubble.Height + 40));
                 rectBubble.Inflate(3, 3);
@@ -278,7 +272,7 @@ private void PaintOverlays (PaintEventArgs e)
 
     #region Events handler
 
-    private void Control_PreviewKeyDown (object sender, PreviewKeyDownEventArgs e)
+    private void OnControlPreviewKeyDown (object sender, PreviewKeyDownEventArgs e)
     {
         if ((e.KeyCode == Keys.C || e.KeyCode == Keys.Insert) && e.Control)
         {
@@ -291,13 +285,13 @@ private void Control_PreviewKeyDown (object sender, PreviewKeyDownEventArgs e)
 
     private void OnControlKeyDown (object sender, KeyEventArgs e)
     {
-        if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
+        if (e.KeyCode is Keys.Up or Keys.Down)
         {
             if (EditingControl != null)
             {
                 if (EditingControl is LogCellEditingControl editControl)
                 {
-                    editControl.EditingControlDataGridView.EndEdit();
+                    _ = editControl.EditingControlDataGridView.EndEdit();
                     var line = editControl.EditingControlDataGridView.CurrentCellAddress.Y;
                     if (e.KeyCode == Keys.Up)
                     {
@@ -319,7 +313,7 @@ private void OnControlKeyDown (object sender, KeyEventArgs e)
                     var scrollIndex = editControl.EditingControlDataGridView.HorizontalScrollingOffset;
                     var selStart = editControl.SelectionStart;
                     editControl.EditingControlDataGridView.CurrentCell = editControl.EditingControlDataGridView.Rows[line].Cells[col];
-                    editControl.EditingControlDataGridView.BeginEdit(false);
+                    _ = editControl.EditingControlDataGridView.BeginEdit(false);
                     editControl.SelectionStart = selStart;
                     editControl.ScrollToCaret();
                     editControl.EditingControlDataGridView.HorizontalScrollingOffset = scrollIndex;