Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/LogExpert.UI/Controls/BufferedDataGridView.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.ComponentModel;
using System.Drawing.Drawing2D;
using System.Runtime.Versioning;

Expand All @@ -6,7 +7,6 @@
using LogExpert.UI.Controls;

using NLog;
using System.ComponentModel;

namespace LogExpert.Dialogs;

Expand Down Expand Up @@ -246,6 +246,7 @@ private void PaintOverlays (PaintEventArgs e)
foreach (var overlay in _overlayList.Values)
{
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);
Expand All @@ -254,6 +255,7 @@ private void PaintOverlays (PaintEventArgs e)
myBuffer.Graphics.SetClip(rectBubble, CombineMode.Union); // Bubble to clip
myBuffer.Graphics.SetClip(rectTableHeader, CombineMode.Exclude);
e.Graphics.SetClip(rectBubble, CombineMode.Union);

RectangleF textRect = new(rectBubble.X, rectBubble.Y, rectBubble.Width, rectBubble.Height);
myBuffer.Graphics.FillRectangle(_brush, rectBubble);
//myBuffer.Graphics.DrawLine(_pen, overlay.Position, new Point(rect.X, rect.Y + rect.Height / 2));
Expand Down
2 changes: 1 addition & 1 deletion src/LogExpert.UI/Entities/PaintHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static void CellPainting (ILogPaintContextUI logPaintCtx, bool focused, i
Alignment = StringAlignment.Center
};

using var brush2 = new SolidBrush(Color.FromArgb(255, 190, 100, 0));
using var brush2 = new SolidBrush(Color.FromArgb(255, 190, 100, 0)); //DarkOrange
using var font = logPaintCtx.MonospacedFont;
e.Graphics.DrawString("i", font, brush2, new RectangleF(r.Left, r.Top, r.Width, r.Height), format);
}
Expand Down
13 changes: 8 additions & 5 deletions src/LogExpert.UI/Interface/ILogPaintContextUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,26 @@ internal interface ILogPaintContextUI : ILogPaintContext
#region Properties

Font MonospacedFont { get; } // Font font = new Font("Courier New", this.Preferences.fontSize, FontStyle.Bold);

Font NormalFont { get; }

Font BoldFont { get; }

Color BookmarkColor { get; }

#endregion

#region Public methods

ILogLine GetLogLine(int lineNum);
ILogLine GetLogLine (int lineNum);

IColumn GetCellValue(int rowIndex, int columnIndex);
IColumn GetCellValue (int rowIndex, int columnIndex);

Bookmark GetBookmarkForLine(int lineNum);
Bookmark GetBookmarkForLine (int lineNum);

HighlightEntry FindHighlightEntry(ITextValue line, bool noWordMatches);
HighlightEntry FindHighlightEntry (ITextValue line, bool noWordMatches);

IList<HighlightMatchEntry> FindHighlightMatches(ITextValue line);
IList<HighlightMatchEntry> FindHighlightMatches (ITextValue line);

#endregion
}
17 changes: 16 additions & 1 deletion src/LogExpert/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ private static void Main (string[] args)
_ = PluginRegistry.PluginRegistry.Create(ConfigManager.Instance.ConfigDir, ConfigManager.Instance.Settings.Preferences.PollingInterval);

SetCulture();
SetDarkMode();

ColumnizerLib.Column.SetMaxDisplayLength(ConfigManager.Instance.Settings.Preferences.MaxDisplayLength);

Expand Down Expand Up @@ -215,6 +216,20 @@ or ArgumentNullException
}
}

[SupportedOSPlatform("windows")]
private static void SetDarkMode ()
{
var darkModeEnabled = ConfigManager.Instance.Settings.Preferences.DarkMode;
if (darkModeEnabled)
{
Application.SetColorMode(SystemColorMode.Dark);
}
else
{
Application.SetColorMode(SystemColorMode.System);
}
}

[SupportedOSPlatform("windows")]
private static void SetCulture ()
{
Expand Down Expand Up @@ -439,4 +454,4 @@ private static void CurrentDomain_UnhandledException (object sender, UnhandledEx
}

#endregion
}
}
32 changes: 16 additions & 16 deletions src/PluginRegistry/PluginHashGenerator.Generated.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@ public static partial class PluginValidator
{
/// <summary>
/// Gets pre-calculated SHA256 hashes for built-in plugins.
/// Generated: 2025-11-30 18:45:26 UTC
/// Generated: 2025-12-01 20:32:57 UTC
/// Configuration: Release
/// Plugin count: 21
/// </summary>
public static Dictionary<string, string> GetBuiltInPluginHashes()
{
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
{
["AutoColumnizer.dll"] = "377982AD769D3479E89B45F514BBE65548D77B9A942DF3FDC18FDC87CC43668E",
["AutoColumnizer.dll"] = "37E42D7BD8BF4B6C28A701A2E121F24692359AAFF26D544BD4FE82F5BA0D02DE",
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
["CsvColumnizer.dll"] = "B99857E99D37BE82DB17E930B3CD1CEF00C6441608F08DEC267245A9B5719E10",
["CsvColumnizer.dll (x86)"] = "B99857E99D37BE82DB17E930B3CD1CEF00C6441608F08DEC267245A9B5719E10",
["DefaultPlugins.dll"] = "B8DC13ECEB0C8B41E486A312B433703D3BB888BDC58A2D656DB4C5E1E4F8CCD2",
["FlashIconHighlighter.dll"] = "53EDA420D21E396F3A40E92C21B042315C477C8C6E2DEA63AC9E3FCFFA889FCD",
["GlassfishColumnizer.dll"] = "F0DD8A34B52C1C2EEA32129F16DD26F96FB1A8078F84282FFFCC92DDF6CF05CB",
["JsonColumnizer.dll"] = "E3B8F96EAE3A8FA9E9A968BACD594510FBE592C15A92FA903EE8BE7814762E60",
["JsonCompactColumnizer.dll"] = "576D983D73CC400734D53CE4EA017399A3229B7DD0DB6BEFAC933503EC50FFBB",
["Log4jXmlColumnizer.dll"] = "EB734D044E52C697BFEC9C030A9F430F2DD82607F4FF04E86961DF82AC06CEC4",
["LogExpert.Core.dll"] = "961C823B40481346B171EB5A7824DCF9757FB8CB534BC35F3C9B19BCE833FF86",
["CsvColumnizer.dll"] = "0FAD54058DA267AFE64F27E35A8DBC9E158DDD1F2F5AED499705E1A9C3B1F154",
["CsvColumnizer.dll (x86)"] = "0FAD54058DA267AFE64F27E35A8DBC9E158DDD1F2F5AED499705E1A9C3B1F154",
["DefaultPlugins.dll"] = "31239786021979ABA32EDDD54B1A97B6E58CB5C65B8ADD5F64800AAAEC943208",
["FlashIconHighlighter.dll"] = "B04EB26D5C4925428FC9604F3B429379FACF0028242FF928C7C24A1E554706C8",
["GlassfishColumnizer.dll"] = "63B1BBEE663CF3DA4EF93A8FD049E5F8173F2E7ED1D5CF234945BC547D743B0F",
["JsonColumnizer.dll"] = "1C06A934A034364FC9F0974C0FA335A0A1BD92A188538F020CF6AAC6C21BCFC7",
["JsonCompactColumnizer.dll"] = "DA285ED66FAB1534A7257D0FB7D9219DB030A4FEB6ABB73623505EBD546B4083",
["Log4jXmlColumnizer.dll"] = "688E34C5100AFD00E4AE0A5C42A4F8DC9A9E30938BAE6EF6AFA07D2ADAADA6CA",
["LogExpert.Core.dll"] = "5BCB8ACA88FA0A90EDA57082241081B3A8F808B4C15D63D2988016FDE1BE7785",
["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
["RegexColumnizer.dll"] = "0A11B032FC19C6F573345B6B960BE55DDD17444141215EBB65A5FA22E5F31CF1",
["SftpFileSystem.dll"] = "CBBCA0AE2150BE0325C92E2E175EA18B1EC3569203328D64FFDF5B35774B6CC4",
["SftpFileSystem.dll (x86)"] = "E48351D978ABA385BB3D0829E82FDADA01A22876D7E0E304ACE6ACCD04F82FD3",
["SftpFileSystem.Resources.dll"] = "AAA32F2CF836D3F8CCF23CDD945B3D7B242883F565DE966C8B5275544558DE60",
["SftpFileSystem.Resources.dll (x86)"] = "AAA32F2CF836D3F8CCF23CDD945B3D7B242883F565DE966C8B5275544558DE60",
["RegexColumnizer.dll"] = "285FF717F8A6BB6D0C7CD876B78126C3BF5FEF60EFC4B8E887CEE3E72A134C1A",
["SftpFileSystem.dll"] = "F2B5EC7FB30D23CDD6B0179EDB426F0BE2B8D89C7FD468CFA29214E7DFBD5E73",
["SftpFileSystem.dll (x86)"] = "24029844F510573B5ACD9E21F1BF6818EFA3DF8CC1C19FFD3C1FE716A89873E6",
["SftpFileSystem.Resources.dll"] = "DB8D188C0113C27F65161D644DC4177707A255E601D53F0924779609E26E1205",
["SftpFileSystem.Resources.dll (x86)"] = "DB8D188C0113C27F65161D644DC4177707A255E601D53F0924779609E26E1205",

};
}
Expand Down