Skip to content

Commit 7e7e6e9

Browse files
HirogenHirogen
committed
readded IBookmarkView since its used
other optimizations
1 parent 3210ccc commit 7e7e6e9

13 files changed

Lines changed: 478 additions & 406 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
namespace LogExpert.UI.Controls.LogWindow;
2424

25-
//TODO: Implemented 4 interfaces explicitly. Find them by searcginh: ILogWindow.<method name>
26-
internal partial class LogWindow : DockContent, ILogPaintContextUI, ILogView, ILogWindow
25+
//TODO: Implemented 4 interfaces explicitly. Find them by searching: ILogWindow.<method name>
26+
public partial class LogWindow : DockContent, ILogPaintContextUI, ILogView, ILogWindow
2727
{
2828
#region Fields
2929

‎src/LogExpert.UI/Controls/LogWindow/TimeSyncList.cs‎

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,100 @@
1-
namespace LogExpert.UI.Controls.LogWindow
1+
namespace LogExpert.UI.Controls.LogWindow;
2+
3+
/// <summary>
4+
/// Holds all windows which are in sync via timestamp
5+
/// </summary>
6+
public class TimeSyncList
27
{
3-
/// <summary>
4-
/// Holds all windows which are in sync via timestamp
5-
/// </summary>
6-
internal class TimeSyncList
7-
{
8-
#region Fields
8+
#region Fields
99

10-
private readonly IList<LogWindow> logWindowList = new List<LogWindow>();
10+
private readonly IList<LogWindow> logWindowList = new List<LogWindow>();
1111

12-
#endregion
12+
#endregion
1313

14-
#region Delegates
14+
#region Delegates
1515

16-
public delegate void WindowRemovedEventHandler(object sender, EventArgs e);
16+
public delegate void WindowRemovedEventHandler (object sender, EventArgs e);
1717

18-
#endregion
18+
#endregion
1919

20-
#region Events
20+
#region Events
2121

22-
public event WindowRemovedEventHandler WindowRemoved;
22+
public event WindowRemovedEventHandler WindowRemoved;
2323

24-
#endregion
24+
#endregion
2525

26-
#region Properties
26+
#region Properties
2727

28-
public DateTime CurrentTimestamp { get; set; }
28+
public DateTime CurrentTimestamp { get; set; }
2929

30-
public int Count
31-
{
32-
get { return logWindowList.Count; }
33-
}
30+
public int Count
31+
{
32+
get { return logWindowList.Count; }
33+
}
3434

35-
#endregion
35+
#endregion
3636

37-
#region Public methods
37+
#region Public methods
3838

39-
public void AddWindow(LogWindow logWindow)
39+
public void AddWindow (LogWindow logWindow)
40+
{
41+
lock (logWindowList)
4042
{
41-
lock (logWindowList)
43+
if (!logWindowList.Contains(logWindow))
4244
{
43-
if (!logWindowList.Contains(logWindow))
44-
{
45-
logWindowList.Add(logWindow);
46-
}
45+
logWindowList.Add(logWindow);
4746
}
4847
}
48+
}
4949

5050

51-
public void RemoveWindow(LogWindow logWindow)
51+
public void RemoveWindow (LogWindow logWindow)
52+
{
53+
lock (logWindowList)
5254
{
53-
lock (logWindowList)
54-
{
55-
logWindowList.Remove(logWindow);
56-
}
57-
OnWindowRemoved();
55+
logWindowList.Remove(logWindow);
5856
}
57+
OnWindowRemoved();
58+
}
5959

6060

61-
/// <summary>
62-
/// Scrolls all LogWindows to the given timestamp
63-
/// </summary>
64-
/// <param name="timestamp"></param>
65-
/// <param name="sender"></param>
66-
public void NavigateToTimestamp(DateTime timestamp, LogWindow sender)
61+
/// <summary>
62+
/// Scrolls all LogWindows to the given timestamp
63+
/// </summary>
64+
/// <param name="timestamp"></param>
65+
/// <param name="sender"></param>
66+
public void NavigateToTimestamp (DateTime timestamp, LogWindow sender)
67+
{
68+
CurrentTimestamp = timestamp;
69+
lock (logWindowList)
6770
{
68-
CurrentTimestamp = timestamp;
69-
lock (logWindowList)
71+
foreach (LogWindow logWindow in logWindowList)
7072
{
71-
foreach (LogWindow logWindow in logWindowList)
73+
if (sender != logWindow)
7274
{
73-
if (sender != logWindow)
74-
{
75-
logWindow.ScrollToTimestamp(timestamp, false, false);
76-
}
75+
logWindow.ScrollToTimestamp(timestamp, false, false);
7776
}
7877
}
7978
}
79+
}
8080

8181

82-
public bool Contains(LogWindow logWindow)
83-
{
84-
return logWindowList.Contains(logWindow);
85-
}
82+
public bool Contains (LogWindow logWindow)
83+
{
84+
return logWindowList.Contains(logWindow);
85+
}
8686

87-
#endregion
87+
#endregion
8888

89-
#region Private Methods
89+
#region Private Methods
9090

91-
private void OnWindowRemoved()
91+
private void OnWindowRemoved ()
92+
{
93+
if (WindowRemoved != null)
9294
{
93-
if (WindowRemoved != null)
94-
{
95-
WindowRemoved(this, new EventArgs());
96-
}
95+
WindowRemoved(this, new EventArgs());
9796
}
98-
99-
#endregion
10097
}
98+
99+
#endregion
101100
}

‎src/LogExpert.UI/Dialogs/BookmarkWindow.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace LogExpert.Dialogs;
1414

1515
//TODO can be moved to Logexpert.UI if the PaintHelper has been refactored
16-
public partial class BookmarkWindow : DockContent, ISharedToolWindow
16+
public partial class BookmarkWindow : DockContent, ISharedToolWindow, IBookmarkView
1717
{
1818
#region Fields
1919

@@ -219,7 +219,7 @@ public void SetCurrentFile (IFileViewContext ctx)
219219
{
220220
if (ctx != null)
221221
{
222-
_logger.Debug("Current file changed to {0}", ctx.LogView.FileName);
222+
_logger.Debug($"Current file changed to {ctx.LogView.FileName}");
223223
lock (paintLock)
224224
{
225225
logView = ctx.LogView;

‎src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs‎

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
using LogExpert.Core.Classes;
1+
using System.Reflection;
2+
using System.Text;
3+
24
using LogExpert.Core.Config;
35
using LogExpert.Core.Entities;
46
using LogExpert.Core.Interface;
57
using LogExpert.Dialogs;
68
using LogExpert.UI.Extensions;
79
using LogExpert.UI.Extensions.Forms;
10+
811
using NLog;
9-
using System.Reflection;
10-
using System.Text;
11-
using static LogExpert.UI.Controls.LogTabWindow.LogTabWindow;
1212

1313
namespace LogExpert.UI.Controls.LogTabWindow;
1414

1515
// Data shared over all LogTabWindow instances
1616
//TODO: Can we get rid of this class?
17-
internal partial class LogTabWindow : Form, ILogTabWindow
17+
public partial class LogTabWindow : Form, ILogTabWindow
1818
{
1919
#region Fields
2020

@@ -64,7 +64,7 @@ internal partial class LogTabWindow : Form, ILogTabWindow
6464
#endregion
6565

6666
#region cTor
67-
public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNumbers, IConfigManager configManager)
67+
public LogTabWindow (string[] fileNames, int instanceNumber, bool showInstanceNumbers, IConfigManager configManager)
6868
{
6969
AutoScaleDimensions = new SizeF(96F, 96F);
7070
AutoScaleMode = AutoScaleMode.Dpi;
@@ -158,7 +158,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum
158158
#endregion
159159

160160
#region ColorTheme
161-
public void ChangeTheme(Control.ControlCollection container)
161+
public void ChangeTheme (Control.ControlCollection container)
162162
{
163163
ColorMode.LoadColorMode(ConfigManager.Settings.Preferences.darkMode);
164164
Win32.UseImmersiveDarkMode(Handle, ColorMode.DarkModeEnabled);
@@ -258,21 +258,21 @@ public void ChangeTheme(Control.ControlCollection container)
258258

259259
#region Delegates
260260

261-
private delegate void AddFileTabsDelegate(string[] fileNames);
261+
private delegate void AddFileTabsDelegate (string[] fileNames);
262262

263-
private delegate void ExceptionFx();
263+
private delegate void ExceptionFx ();
264264

265-
private delegate void FileNotFoundDelegate(LogWindow.LogWindow logWin);
265+
private delegate void FileNotFoundDelegate (LogWindow.LogWindow logWin);
266266

267-
private delegate void FileRespawnedDelegate(LogWindow.LogWindow logWin);
267+
private delegate void FileRespawnedDelegate (LogWindow.LogWindow logWin);
268268

269-
public delegate void HighlightSettingsChangedEventHandler(object sender, EventArgs e);
269+
public delegate void HighlightSettingsChangedEventHandler (object sender, EventArgs e);
270270

271-
private delegate void LoadMultiFilesDelegate(string[] fileName, EncodingOptions encodingOptions);
271+
private delegate void LoadMultiFilesDelegate (string[] fileName, EncodingOptions encodingOptions);
272272

273-
private delegate void SetColumnizerFx(ILogLineColumnizer columnizer);
273+
private delegate void SetColumnizerFx (ILogLineColumnizer columnizer);
274274

275-
private delegate void SetTabIconDelegate(LogWindow.LogWindow logWindow, Icon icon);
275+
private delegate void SetTabIconDelegate (LogWindow.LogWindow logWindow, Icon icon);
276276

277277
#endregion
278278

@@ -308,7 +308,7 @@ public LogWindow.LogWindow CurrentLogWindow
308308

309309
#region Internals
310310

311-
internal HighlightGroup FindHighlightGroup(string groupName)
311+
internal HighlightGroup FindHighlightGroup (string groupName)
312312
{
313313
lock (HighlightGroupList)
314314
{
@@ -340,24 +340,4 @@ private class LogWindowData
340340

341341
#endregion
342342
}
343-
}
344-
345-
public class StaticLogTabWindowData
346-
{
347-
#region Properties
348-
349-
public ILogTabWindow CurrentLockedMainWindow { get; set; }
350-
351-
#endregion
352-
}
353-
354-
public abstract class AbstractLogTabWindow()
355-
{
356-
public static StaticLogTabWindowData StaticData { get; set; } = new StaticLogTabWindowData();
357-
358-
public static ILogTabWindow Create(string[] fileNames, int instanceNumber, bool showInstanceNumbers, IConfigManager configManager)
359-
{
360-
return new LogTabWindow(fileNames, instanceNumber, showInstanceNumbers, configManager);
361-
}
362-
363-
}
343+
}

0 commit comments

Comments
 (0)