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
5 changes: 3 additions & 2 deletions src/LogExpert.UI/Controls/LogWindow/LogWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,7 @@ private void ApplyToolStripMenuItemResources ()

private void ApplyToolTipsResources ()
{
helpToolTip.AutoPopDelay = 5000; //this is in ms, 5000ms = 5 seconds
helpToolTip.SetToolTip(btnColumn, Resources.LogWindow_UI_Button_ToolTip_Column);
helpToolTip.SetToolTip(columnRestrictCheckBox, Resources.LogWindow_UI_CheckBox_ToolTip_ColumnRestrict);
helpToolTip.SetToolTip(knobControlFuzzy, Resources.LogWindow_UI_KnobControl_Fuzzy);
Expand Down Expand Up @@ -1333,7 +1334,7 @@ private void OnSelectionChangedTriggerSignal (object sender, EventArgs e)
if (IsMultiFile)
{
//MethodInvoker invoker = DisplayCurrentFileOnStatusline;
_ = Task.Run(DisplayCurrentFileOnStatusline);
_ = Task.Run(DisplayCurrentFileOnStatusline);
//_ = invoker.BeginInvoke(null, null);
}
else
Expand Down Expand Up @@ -2982,7 +2983,7 @@ private void LogEventWorker ()
{
return;
}

CheckFilterAndHighlight(e);
_timeSpreadCalc.SetLineCount(e.LineCount);
}
Expand Down
2 changes: 1 addition & 1 deletion src/LogExpert.UI/Controls/LogWindow/TimeSpreadigControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public TimeSpreadingControl ()
Font = new Font("Courier New", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
_toolTip.InitialDelay = 0;
_toolTip.ReshowDelay = 0;
_toolTip.ShowAlways = true;
_toolTip.AutoPopDelay = 5000;
DoubleBuffered = false;

ResumeLayout();
Expand Down
57 changes: 17 additions & 40 deletions src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public LogTabWindow (string[] fileNames, int instanceNumber, bool showInstanceNu
_menuToolbarController = new MenuToolbarController();
_menuToolbarController.InitializeMenus(mainMenuStrip, buttonToolStrip, externalToolsToolStrip, dragControlDateTime, checkBoxFollowTail);
InitializeMenuToolbarControllerEvents();

ApplyTextResources();

ConfigManager = configManager;
Expand Down Expand Up @@ -184,29 +184,9 @@ private void InitializeTabControllerEvents ()

#endregion

#region Delegates

private delegate void AddFileTabsDelegate (string[] fileNames);

private delegate void ExceptionFx ();

private delegate void FileNotFoundDelegate (LogWindow.LogWindow logWin);

private delegate void FileRespawnedDelegate (LogWindow.LogWindow logWin);

public delegate void HighlightSettingsChangedEventHandler (object sender, EventArgs e);

private delegate void LoadMultiFilesDelegate (string[] fileName, EncodingOptions encodingOptions);

private delegate void SetColumnizerFx (ILogLineMemoryColumnizer columnizer);

private delegate void SetTabIconDelegate (LogWindow.LogWindow logWindow, Icon icon);

#endregion

#region Events

public event HighlightSettingsChangedEventHandler HighlightSettingsChanged;
public event EventHandler HighlightSettingsChanged;

#endregion

Expand Down Expand Up @@ -598,15 +578,15 @@ public LogWindow.LogWindow AddMultiFileTab (string[] fileNames)
multiFileEnabledStripMenuItem.Checked = true;
EncodingOptions encodingOptions = new();
FillDefaultEncodingFromSettings(encodingOptions);
_ = BeginInvoke(new LoadMultiFilesDelegate(logWindow.LoadFilesAsMulti), fileNames, encodingOptions);
_ = BeginInvoke(logWindow.LoadFilesAsMulti, fileNames, encodingOptions);
AddToFileHistory(fileNames[0]);
return logWindow;
}

[SupportedOSPlatform("windows")]
public void LoadFiles (string[] fileNames)
{
_ = Invoke(new AddFileTabsDelegate(AddFileTabs), [fileNames]);
_ = Invoke(AddFileTabs, [fileNames]);
}

[SupportedOSPlatform("windows")]
Expand Down Expand Up @@ -703,7 +683,7 @@ private void OnTabControllerWindowActivated (object sender, WindowActivatedEvent

// Update the tab icon to reflect cleared dirty state
var icon = GetLedIcon(data.LedState.DiffSum, data);
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), newWindow, icon);
_ = BeginInvoke(SetTabIcon, newWindow, icon);
}

// Notify the window it has been activated
Expand Down Expand Up @@ -876,7 +856,7 @@ public void FollowTailChanged (LogWindow.LogWindow logWindow, bool isEnabled, bo
if (Preferences.ShowTailState)
{
var icon = GetLedIcon(data.LedState.DiffSum, data);
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWindow, icon);
_ = BeginInvoke(SetTabIcon, logWindow, icon);
}
}

Expand Down Expand Up @@ -1487,7 +1467,7 @@ private void StatusLineEventWorker (StatusLineEventArgs e)
private void FileNotFound (LogWindow.LogWindow logWin)
{
var data = logWin.Tag as LogWindowData;
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWin, _deadIcon);
_ = BeginInvoke(SetTabIcon, logWin, _deadIcon);
dragControlDateTime.Visible = false;
}

Expand All @@ -1497,7 +1477,7 @@ private void FileRespawned (LogWindow.LogWindow logWin)
var data = logWin.Tag as LogWindowData;
data.LedState.DiffSum = 0;
var icon = GetLedIcon(0, data);
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWin, icon);
_ = BeginInvoke(SetTabIcon, logWin, icon);
}

[SupportedOSPlatform("windows")]
Expand Down Expand Up @@ -1641,7 +1621,7 @@ private void SetTabIcons (Preferences preferences)
{
var data = logWindow.Tag as LogWindowData;
var icon = GetLedIcon(data.LedState.DiffSum, data);
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWindow, icon);
_ = BeginInvoke(SetTabIcon, logWindow, icon);
}
}

Expand Down Expand Up @@ -2163,8 +2143,7 @@ private void OnSelectFilterToolStripMenuItemClick (object sender, EventArgs e)
if (logWindow.CurrentColumnizer.GetType() != form.SelectedColumnizer.GetType())
{
//logWindow.SetColumnizer(form.SelectedColumnizer);
SetColumnizerFx fx = logWindow.ForceColumnizer;
_ = logWindow.Invoke(fx, form.SelectedColumnizer);
_ = logWindow.Invoke(logWindow.ForceColumnizer, form.SelectedColumnizer);
SetColumnizerHistoryEntry(logWindow.FileName, form.SelectedColumnizer);
}
else
Expand All @@ -2180,8 +2159,7 @@ private void OnSelectFilterToolStripMenuItemClick (object sender, EventArgs e)
{
if (CurrentLogWindow.CurrentColumnizer.GetType() != form.SelectedColumnizer.GetType())
{
SetColumnizerFx fx = CurrentLogWindow.ForceColumnizer;
_ = CurrentLogWindow.Invoke(fx, form.SelectedColumnizer);
_ = CurrentLogWindow.Invoke(CurrentLogWindow.ForceColumnizer, form.SelectedColumnizer);
SetColumnizerHistoryEntry(CurrentLogWindow.FileName, form.SelectedColumnizer);
}

Expand Down Expand Up @@ -2434,12 +2412,12 @@ private void OnFileSizeChanged (object sender, LogEventArgs e)

private void OnLogWindowFileNotFound (object sender, EventArgs e)
{
_ = Invoke(new FileNotFoundDelegate(FileNotFound), sender);
_ = Invoke(FileNotFound, sender);
}

private void OnLogWindowFileRespawned (object sender, EventArgs e)
{
_ = Invoke(new FileRespawnedDelegate(FileRespawned), sender);
_ = Invoke(FileRespawned, sender);
}

private void OnLogWindowFilterListChanged (object sender, FilterListChangedEventArgs e)
Expand Down Expand Up @@ -2476,7 +2454,7 @@ private void OnTailFollowed (object sender, EventArgs e)
var data = ((LogWindow.LogWindow)sender).Tag as LogWindowData;
data.LedState.IsDirty = false;
var icon = GetLedIcon(data.LedState.DiffSum, data);
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), (LogWindow.LogWindow)sender, icon);
_ = BeginInvoke(SetTabIcon, (LogWindow.LogWindow)sender, icon);
}
}
}
Expand All @@ -2492,7 +2470,7 @@ private void OnLogWindowSyncModeChanged (object sender, SyncModeEventArgs e)
: TimeSyncState.NotSynced;

var icon = GetLedIcon(data.LedState.DiffSum, data);
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), (LogWindow.LogWindow)sender, icon);
_ = BeginInvoke(SetTabIcon, (LogWindow.LogWindow)sender, icon);
}
}

Expand Down Expand Up @@ -2551,7 +2529,7 @@ private void OnReloadToolStripMenuItemClick (object sender, EventArgs e)
{
var data = CurrentLogWindow.Tag as LogWindowData;
var icon = GetLedIcon(0, data);
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), CurrentLogWindow, icon);
_ = BeginInvoke(SetTabIcon, CurrentLogWindow, icon);
CurrentLogWindow.Reload();
}
}
Expand Down Expand Up @@ -2930,8 +2908,7 @@ private void OnThrowExceptionGUIThreadToolStripMenuItemClick (object sender, Eve

private void OnThrowExceptionBackgroundThToolStripMenuItemClick (object sender, EventArgs e)
{
ExceptionFx fx = ThrowExceptionFx;
_ = fx.BeginInvoke(null, null);
_ = Task.Run(ThrowExceptionFx);
}

private void OnThrowExceptionBackgroundThreadToolStripMenuItemClick (object sender, EventArgs e)
Expand Down
34 changes: 17 additions & 17 deletions src/PluginRegistry/PluginHashGenerator.Generated.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,36 @@ public static partial class PluginValidator
{
/// <summary>
/// Gets pre-calculated SHA256 hashes for built-in plugins.
/// Generated: 2026-03-03 09:49:40 UTC
/// Generated: 2026-03-03 14:51:13 UTC
/// Configuration: Release
/// Plugin count: 22
/// </summary>
public static Dictionary<string, string> GetBuiltInPluginHashes()
{
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
{
["AutoColumnizer.dll"] = "D8245D04F9B9797E52333B116964616C2009318C3732BC19392D3013029CF2F3",
["AutoColumnizer.dll"] = "94A2870DD326A4B873BC627AE4BB06963D3B1906C6ADBB94597FE442AFAAA9ED",
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
["CsvColumnizer.dll"] = "62B6D1352B2FD99FE8E03B37DF4CC4EBF16C92D05B782C7175D09D182DE2EC4E",
["CsvColumnizer.dll (x86)"] = "62B6D1352B2FD99FE8E03B37DF4CC4EBF16C92D05B782C7175D09D182DE2EC4E",
["DefaultPlugins.dll"] = "38C3FC543593E074EB4733CF9A931B05D50C0F5DD0F60BFDDB7B9741EE7D0AEA",
["FlashIconHighlighter.dll"] = "4F4A89E20FA88ACA6A67195698DB1A3CE5EFDDD04B65237A51BB541567BF794E",
["GlassfishColumnizer.dll"] = "4A1ED175E99CE431BBDECCF645BC4C13137A6AD6575CFF99BBF4D8B42DE2275B",
["JsonColumnizer.dll"] = "80F0BC83791082EF7B386E1714C50C9765D6F6E9A65687115DBF9E54318B43A2",
["JsonCompactColumnizer.dll"] = "079BB5C7EC7CDCD9C932F2BD2036051C38FA0ECAF47080C2BD68775D16C0F91F",
["Log4jXmlColumnizer.dll"] = "741A255689F23FC12028E38820A8485EEA69FEDFB0B4BDAECD512BDA5B7B2227",
["LogExpert.Core.dll"] = "26562EA5EB6958EA1FE7A5EAECC4BD406354FEE903A895918E1FFEB933871B5E",
["LogExpert.Resources.dll"] = "9E74072C4C0A12068B9884BD5E53FC89A25626F13C4371B62B9AC5A69971A683",
["CsvColumnizer.dll"] = "4723E306C5148A3D74FDA1892B1F0EBF8838E08C87E75D7210F566FFE2C76784",
["CsvColumnizer.dll (x86)"] = "4723E306C5148A3D74FDA1892B1F0EBF8838E08C87E75D7210F566FFE2C76784",
["DefaultPlugins.dll"] = "19CE5C9F946A3741FFC388BF6FF49346B950B22FD7A78D456ECAD8E87A40AF9F",
["FlashIconHighlighter.dll"] = "FE12290FE581C9FEA1BA8DC6C8AB2FB5E73B6B3F9F4B2B663C06DEC6B157CDD1",
["GlassfishColumnizer.dll"] = "4EF6C6D0B0C4A861E87CBC69735B56AA139C4BE474D54AF5B72703E200AA50CA",
["JsonColumnizer.dll"] = "302C146435BA73D9D0C4DA408D88E5082D1528FF987CDBE54BC7B49EBA7B784D",
["JsonCompactColumnizer.dll"] = "ED6FF92F711F51B82C0269FF6967E5165AA781CDBFFFE73252840AF6345AF7B5",
["Log4jXmlColumnizer.dll"] = "FB3142052E4C952497D7340747CAC6CD0F631120C91850C3E27BC94FFD9BF0B4",
["LogExpert.Core.dll"] = "AFF90A430B5EB9D61B9C88DC7E15597D9407956EA4F926C77F76660BA23E694F",
["LogExpert.Resources.dll"] = "D629EE9BDDABFDD1C60D75F8EAA56D1CDDE62774BAB6DFB2DE316E53D6373ADC",
["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"] = "95DD2F747F5D6C1BA096476238C23D0531B65F7734D7CAA66425875EA15AD571",
["SftpFileSystem.dll"] = "061D358558BF35DF9151B3807A23F6BAE9756D0B38DBDC3D3951AFA1A48E0925",
["SftpFileSystem.dll (x86)"] = "BA2F6A6439181D68E10AA32DE5988E1B55761D9925FCA0A1826E60AB55F9C87A",
["SftpFileSystem.Resources.dll"] = "A91DA7470FE4370532A91409DF78206291523682A1BF7AF2A33F4C07E940460A",
["SftpFileSystem.Resources.dll (x86)"] = "A91DA7470FE4370532A91409DF78206291523682A1BF7AF2A33F4C07E940460A",
["RegexColumnizer.dll"] = "1AF8EF852B060D69EFD9B57BDE155EE70D9682AC220899DE773652BE6E74C2E7",
["SftpFileSystem.dll"] = "BE8143A21E46FAF8521B865FC4CBDE39D51B2BEB276901E78AE1C10FA6E24BE2",
["SftpFileSystem.dll (x86)"] = "8EAB50EB4A72A23726063F8935A916E9E96F3BB793A24E5AEB3336B127F7E69F",
["SftpFileSystem.Resources.dll"] = "54561A5E402D3C020CEB224E9E950208E1F9FC75AC06B421059FE8CC8784785E",
["SftpFileSystem.Resources.dll (x86)"] = "54561A5E402D3C020CEB224E9E950208E1F9FC75AC06B421059FE8CC8784785E",

};
}
Expand Down
Loading