Skip to content

Commit 496047e

Browse files
HirogenHirogen
committed
Merge branch 'Development' into prepare_release
# Conflicts: # src/PluginRegistry/PluginHashGenerator.Generated.cs
2 parents 520adae + 5967010 commit 496047e

5 files changed

Lines changed: 44 additions & 24 deletions

File tree

‎src/LogExpert.UI/Controls/BufferedDataGridView.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.ComponentModel;
12
using System.Drawing.Drawing2D;
23
using System.Runtime.Versioning;
34

@@ -6,7 +7,6 @@
67
using LogExpert.UI.Controls;
78

89
using NLog;
9-
using System.ComponentModel;
1010

1111
namespace LogExpert.Dialogs;
1212

@@ -246,6 +246,7 @@ private void PaintOverlays (PaintEventArgs e)
246246
foreach (var overlay in _overlayList.Values)
247247
{
248248
var textSize = myBuffer.Graphics.MeasureString(overlay.Bookmark.Text, _font, 300);
249+
249250
Rectangle rectBubble = new(overlay.Position, new Size((int)textSize.Width, (int)textSize.Height));
250251
rectBubble.Offset(60, -(rectBubble.Height + 40));
251252
rectBubble.Inflate(3, 3);
@@ -254,6 +255,7 @@ private void PaintOverlays (PaintEventArgs e)
254255
myBuffer.Graphics.SetClip(rectBubble, CombineMode.Union); // Bubble to clip
255256
myBuffer.Graphics.SetClip(rectTableHeader, CombineMode.Exclude);
256257
e.Graphics.SetClip(rectBubble, CombineMode.Union);
258+
257259
RectangleF textRect = new(rectBubble.X, rectBubble.Y, rectBubble.Width, rectBubble.Height);
258260
myBuffer.Graphics.FillRectangle(_brush, rectBubble);
259261
//myBuffer.Graphics.DrawLine(_pen, overlay.Position, new Point(rect.X, rect.Y + rect.Height / 2));

‎src/LogExpert.UI/Entities/PaintHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static void CellPainting (ILogPaintContextUI logPaintCtx, bool focused, i
7878
Alignment = StringAlignment.Center
7979
};
8080

81-
using var brush2 = new SolidBrush(Color.FromArgb(255, 190, 100, 0));
81+
using var brush2 = new SolidBrush(Color.FromArgb(255, 190, 100, 0)); //DarkOrange
8282
using var font = logPaintCtx.MonospacedFont;
8383
e.Graphics.DrawString("i", font, brush2, new RectangleF(r.Left, r.Top, r.Width, r.Height), format);
8484
}

‎src/LogExpert.UI/Interface/ILogPaintContextUI.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,26 @@ internal interface ILogPaintContextUI : ILogPaintContext
1414
#region Properties
1515

1616
Font MonospacedFont { get; } // Font font = new Font("Courier New", this.Preferences.fontSize, FontStyle.Bold);
17+
1718
Font NormalFont { get; }
19+
1820
Font BoldFont { get; }
21+
1922
Color BookmarkColor { get; }
2023

2124
#endregion
2225

2326
#region Public methods
2427

25-
ILogLine GetLogLine(int lineNum);
28+
ILogLine GetLogLine (int lineNum);
2629

27-
IColumn GetCellValue(int rowIndex, int columnIndex);
30+
IColumn GetCellValue (int rowIndex, int columnIndex);
2831

29-
Bookmark GetBookmarkForLine(int lineNum);
32+
Bookmark GetBookmarkForLine (int lineNum);
3033

31-
HighlightEntry FindHighlightEntry(ITextValue line, bool noWordMatches);
34+
HighlightEntry FindHighlightEntry (ITextValue line, bool noWordMatches);
3235

33-
IList<HighlightMatchEntry> FindHighlightMatches(ITextValue line);
36+
IList<HighlightMatchEntry> FindHighlightMatches (ITextValue line);
3437

3538
#endregion
3639
}

‎src/LogExpert/Program.cs‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ private static void Main (string[] args)
9999
_ = PluginRegistry.PluginRegistry.Create(ConfigManager.Instance.ConfigDir, ConfigManager.Instance.Settings.Preferences.PollingInterval);
100100

101101
SetCulture();
102+
SetDarkMode();
102103

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

@@ -215,6 +216,20 @@ or ArgumentNullException
215216
}
216217
}
217218

219+
[SupportedOSPlatform("windows")]
220+
private static void SetDarkMode ()
221+
{
222+
var darkModeEnabled = ConfigManager.Instance.Settings.Preferences.DarkMode;
223+
if (darkModeEnabled)
224+
{
225+
Application.SetColorMode(SystemColorMode.Dark);
226+
}
227+
else
228+
{
229+
Application.SetColorMode(SystemColorMode.System);
230+
}
231+
}
232+
218233
[SupportedOSPlatform("windows")]
219234
private static void SetCulture ()
220235
{
@@ -439,4 +454,4 @@ private static void CurrentDomain_UnhandledException (object sender, UnhandledEx
439454
}
440455

441456
#endregion
442-
}
457+
}

‎src/PluginRegistry/PluginHashGenerator.Generated.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ public static partial class PluginValidator
1010
{
1111
/// <summary>
1212
/// Gets pre-calculated SHA256 hashes for built-in plugins.
13-
/// Generated: 2025-12-01 20:31:32 UTC
13+
/// Generated: 2025-11-30 18:45:26 UTC
1414
/// Configuration: Release
1515
/// Plugin count: 21
1616
/// </summary>
1717
public static Dictionary<string, string> GetBuiltInPluginHashes()
1818
{
1919
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
2020
{
21-
["AutoColumnizer.dll"] = "721F63351DCAB6972C4FBF7E80587884A5FD5F142C1907B89E132AF968085F24",
21+
["AutoColumnizer.dll"] = "37E42D7BD8BF4B6C28A701A2E121F24692359AAFF26D544BD4FE82F5BA0D02DE",
2222
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
2323
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
24-
["CsvColumnizer.dll"] = "2B3F544EC486882B4FB993EC4C1A91505510753D40DE18E01E1082EF69117F14",
25-
["CsvColumnizer.dll (x86)"] = "2B3F544EC486882B4FB993EC4C1A91505510753D40DE18E01E1082EF69117F14",
26-
["DefaultPlugins.dll"] = "CC98616F594D7C232541F21152BA4C14093D0C12733F06D89C743D34EA70F28B",
27-
["FlashIconHighlighter.dll"] = "CFFF1BD63BD152D6106533882C596346A75CB8A1B7E50E7313F9D748360511CE",
28-
["GlassfishColumnizer.dll"] = "97BAF5619F59AB974E8066365CCFAE66F5AC643B6629A148530487A73AA4E1FF",
29-
["JsonColumnizer.dll"] = "CB8661A9BB4CE33EE16296EA68B85F43C34935708F25624AD093AD8A8AF624C5",
30-
["JsonCompactColumnizer.dll"] = "7448084D1C2B6ACBD94219AEC39F789EE4397BFF9318C9DA98CB4558B55A832A",
31-
["Log4jXmlColumnizer.dll"] = "4192DB1CB0035819D093947494F416AC027110E5AA6F0C5A2A095B79F120BC13",
32-
["LogExpert.Core.dll"] = "6B94139B21613251AE58C25957D877B01AD9AEA1C457D8F4595685D4E05E3963",
24+
["CsvColumnizer.dll"] = "0FAD54058DA267AFE64F27E35A8DBC9E158DDD1F2F5AED499705E1A9C3B1F154",
25+
["CsvColumnizer.dll (x86)"] = "0FAD54058DA267AFE64F27E35A8DBC9E158DDD1F2F5AED499705E1A9C3B1F154",
26+
["DefaultPlugins.dll"] = "31239786021979ABA32EDDD54B1A97B6E58CB5C65B8ADD5F64800AAAEC943208",
27+
["FlashIconHighlighter.dll"] = "B04EB26D5C4925428FC9604F3B429379FACF0028242FF928C7C24A1E554706C8",
28+
["GlassfishColumnizer.dll"] = "63B1BBEE663CF3DA4EF93A8FD049E5F8173F2E7ED1D5CF234945BC547D743B0F",
29+
["JsonColumnizer.dll"] = "1C06A934A034364FC9F0974C0FA335A0A1BD92A188538F020CF6AAC6C21BCFC7",
30+
["JsonCompactColumnizer.dll"] = "DA285ED66FAB1534A7257D0FB7D9219DB030A4FEB6ABB73623505EBD546B4083",
31+
["Log4jXmlColumnizer.dll"] = "688E34C5100AFD00E4AE0A5C42A4F8DC9A9E30938BAE6EF6AFA07D2ADAADA6CA",
32+
["LogExpert.Core.dll"] = "5BCB8ACA88FA0A90EDA57082241081B3A8F808B4C15D63D2988016FDE1BE7785",
3333
["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3434
["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3535
["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
3636
["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
37-
["RegexColumnizer.dll"] = "F1A04D1A92A2CAAEEA87E3DDF4E8E848B41F716486AA0CAF1F803882EDA5108E",
38-
["SftpFileSystem.dll"] = "62FC7CC676462CBA07674EF1BDDD0A5CEAF60236953131F405FBC2FB0F823756",
39-
["SftpFileSystem.dll (x86)"] = "DCC51CD13EE5FBBCBBB1C27436FBC6C8130C68F337DB9C00F67818BD5E7675DA",
40-
["SftpFileSystem.Resources.dll"] = "B488D6CB1195C30697DE0C6B78CA405C5A9707F814BD9618CAE5DFC6C6DD9B37",
41-
["SftpFileSystem.Resources.dll (x86)"] = "B488D6CB1195C30697DE0C6B78CA405C5A9707F814BD9618CAE5DFC6C6DD9B37",
37+
["RegexColumnizer.dll"] = "285FF717F8A6BB6D0C7CD876B78126C3BF5FEF60EFC4B8E887CEE3E72A134C1A",
38+
["SftpFileSystem.dll"] = "F2B5EC7FB30D23CDD6B0179EDB426F0BE2B8D89C7FD468CFA29214E7DFBD5E73",
39+
["SftpFileSystem.dll (x86)"] = "24029844F510573B5ACD9E21F1BF6818EFA3DF8CC1C19FFD3C1FE716A89873E6",
40+
["SftpFileSystem.Resources.dll"] = "DB8D188C0113C27F65161D644DC4177707A255E601D53F0924779609E26E1205",
41+
["SftpFileSystem.Resources.dll (x86)"] = "DB8D188C0113C27F65161D644DC4177707A255E601D53F0924779609E26E1205",
4242

4343
};
4444
}

0 commit comments

Comments
 (0)