@@ -200,6 +200,7 @@ public bool RealTimeMode
200200 public LogMessagesUC ( IUserSettingsManager userSettingsManager , IExtensionsManager extensionManager , IFactoriesManager factoriesManager , IAnalogyLogger logger )
201201 {
202202 Logger = logger ;
203+ Id = Guid . NewGuid ( ) ;
203204 Settings = userSettingsManager ;
204205 ExtensionManager = extensionManager ;
205206 FactoriesManager = factoriesManager ;
@@ -303,7 +304,6 @@ public LogMessagesUC(IUserSettingsManager userSettingsManager, IExtensionsManage
303304 _filterCriteria . IncludeFilterCriteriaUIOptions = IncludeFilterCriteriaUIOptions ;
304305 _filterCriteria . ExcludeFilterCriteriaUIOptions = ExcludeFilterCriteriaUIOptions ;
305306
306-
307307 }
308308
309309 private async void LogMessagesUC_Load ( object sender , EventArgs e )
@@ -347,6 +347,16 @@ private async void LogMessagesUC_Load(object sender, EventArgs e)
347347 LoadReplacementHeaders ( ) ;
348348 HideColumns ( ) ;
349349 BookmarkModeUI ( ) ;
350+
351+
352+ if ( ! string . IsNullOrEmpty ( Settings . LogsLayoutFileName ) && File . Exists ( Settings . LogsLayoutFileName ) )
353+ {
354+ string name = Path . GetFileNameWithoutExtension ( Settings . LogsLayoutFileName ) ;
355+ wsLogs . LoadWorkspace ( name , Settings . LogsLayoutFileName ) ;
356+ wsLogs . ApplyWorkspace ( name ) ;
357+ }
358+ LoadWorkspace ( CurrentLogLayoutFileName ) ;
359+
350360 await LoadExtensions ( ) ;
351361 SetupEventsHandlers ( ) ;
352362
@@ -392,9 +402,9 @@ private async void LogMessagesUC_Load(object sender, EventArgs e)
392402
393403 private void HideColumns ( )
394404 {
395- if ( DataProvider . HideColumns ( ) != null )
405+ if ( DataProvider . HideAdditionalColumns ( ) != null )
396406 {
397- foreach ( string columnFieldName in DataProvider . HideColumns ( ) )
407+ foreach ( string columnFieldName in DataProvider . HideAdditionalColumns ( ) )
398408 {
399409 var column = logGrid . Columns . ColumnByFieldName ( columnFieldName ) ;
400410 if ( column != null )
@@ -403,6 +413,17 @@ private void HideColumns()
403413 }
404414 }
405415 }
416+ if ( DataProvider . HideExistingColumns ( ) != null )
417+ {
418+ foreach ( AnalogyLogMessagePropertyName columnFieldName in DataProvider . HideExistingColumns ( ) )
419+ {
420+ var column = logGrid . Columns . ColumnByFieldName ( columnFieldName . ToString ( ) ) ;
421+ if ( column != null )
422+ {
423+ column . Visible = false ;
424+ }
425+ }
426+ }
406427 }
407428
408429 public void LoadWorkspace ( string fileName )
@@ -1071,18 +1092,13 @@ private void LogGrid_MouseUp(object sender, MouseEventArgs e)
10711092 }
10721093 private void LoadReplacementHeaders ( )
10731094 {
1074- if ( DataProvider == null )
1095+ if ( DataProvider ? . GetReplacementHeaders ( ) == null )
10751096 {
10761097 return ;
10771098 }
10781099
10791100 try
10801101 {
1081- if ( DataProvider . GetReplacementHeaders ( ) == null || ! DataProvider . GetReplacementHeaders ( ) . Any ( ) )
1082- {
1083- return ;
1084- }
1085-
10861102 foreach ( ( string fieldName , string replacementHeader ) in DataProvider . GetReplacementHeaders ( ) )
10871103 {
10881104 var column = logGrid . Columns . FirstOrDefault ( ( col ) => col . FieldName == fieldName ) ;
@@ -1091,15 +1107,6 @@ private void LoadReplacementHeaders()
10911107 column . Caption = replacementHeader ;
10921108 }
10931109 }
1094-
1095- foreach ( string fieldName in DataProvider . HideColumns ( ) )
1096- {
1097- var column = logGrid . Columns . FirstOrDefault ( ( col ) => col . FieldName == fieldName ) ;
1098- if ( column != null )
1099- {
1100- column . Visible = false ;
1101- }
1102- }
11031110 }
11041111 catch ( Exception )
11051112 {
@@ -1439,11 +1446,25 @@ public async Task LoadExtensions()
14391446 }
14401447 foreach ( IAnalogyExtensionUserControl extension in UserControlRegisteredExtensions )
14411448 {
1442- var page = dockManager1 . AddPanel ( DockingStyle . Float ) ;
1443- page . Text = extension . Title ;
1444- page . Controls . Add ( extension . UserControl ) ;
1445- await extension . InitializeUserControl ( this , Logger ) ;
1446- page . DockedAsTabbedDocument = true ;
1449+ DockPanel ? pnl = dockManager1 . Panels . FirstOrDefault ( i => i . ID == extension . Id ) ;
1450+ if ( pnl == null )
1451+ {
1452+ pnl = dockManager1 . AddPanel ( DockingStyle . Float ) ;
1453+ pnl . Text = extension . Title ;
1454+ pnl . ID = extension . Id ;
1455+ pnl . DockedAsTabbedDocument = true ;
1456+ }
1457+ pnl . Controls . Add ( extension . CreateUserControl ( Id , Logger ) ) ;
1458+ pnl . SizeChanged += ExtensionPanel_SizeChanged ;
1459+ await extension . InitializeUserControl ( this , Id , Logger ) ;
1460+ }
1461+ }
1462+
1463+ private void ExtensionPanel_SizeChanged ( object ? sender , EventArgs e )
1464+ {
1465+ if ( sender is DockPanel { Controls . Count : > 0 } pnl )
1466+ {
1467+ pnl . Controls [ 0 ] . Size = pnl . Size ;
14471468 }
14481469 }
14491470
@@ -1635,6 +1656,7 @@ internal DataTable GetFilteredDataTable()
16351656 }
16361657
16371658 public List < IAnalogyLogMessage > GetMessages ( ) => PagingManager . GetAllMessages ( ) ;
1659+ public Guid Id { get ; }
16381660
16391661 private string GetFilterDisplayText ( DateRangeFilter filterType )
16401662 {
@@ -1792,7 +1814,7 @@ public void AppendMessage(IAnalogyLogMessage message, string dataSource)
17921814 {
17931815 if ( IsHandleCreated )
17941816 {
1795- BeginInvoke ( new MethodInvoker ( ( ) => extension . NewMessage ( message ) ) ) ;
1817+ BeginInvoke ( new MethodInvoker ( ( ) => extension . NewMessage ( message , Id ) ) ) ;
17961818 }
17971819 }
17981820 }
@@ -1909,7 +1931,7 @@ public void AppendMessages(List<IAnalogyLogMessage> messages, string dataSource)
19091931 {
19101932 foreach ( var extension in UserControlRegisteredExtensions )
19111933 {
1912- BeginInvoke ( new MethodInvoker ( ( ) => extension . NewMessages ( messages ) ) ) ;
1934+ BeginInvoke ( new MethodInvoker ( ( ) => extension . NewMessages ( messages , Id ) ) ) ;
19131935 }
19141936 }
19151937
0 commit comments