V5

Analogy.CommonControls/UserControls/LogMessagesUC.cs

@@ -102,8 +102,8 @@ private bool ChangeRawSQLMode(bool enable)
         private string OldTextInclude = string.Empty;
         private string OldTextExclude = string.Empty;
         public int fileLoadingCount;
-        public List<FilterCriteriaUIOption> IncludeFilterCriteriaUIOptions { get; set; }
-        public List<FilterCriteriaUIOption> ExcludeFilterCriteriaUIOptions { get; set; }
+        private List<FilterCriteriaUIOption> IncludeFilterCriteriaUIOptions { get; set; }
+        private List<FilterCriteriaUIOption> ExcludeFilterCriteriaUIOptions { get; set; }
         private bool FullModeEnabled { get; set; }
         private bool LoadingInProgress => fileLoadingCount > 0;
         private IUserSettingsManager Settings { get; set; }
@@ -1343,6 +1343,10 @@ private void LoadUISettings()
             gridColumnProcessID.FieldName = Common.CommonUtils.ColumnProcessId;
             gridColumnModule.FieldName = Common.CommonUtils.ColumnModule;
             gridColumnRawText.FieldName = Common.CommonUtils.ColumnRawText;
+            gridColumnBookmarkObject.FieldName = Common.CommonUtils.AnalogyMessageColumn;
+            gridColumnObject.Caption = Common.CommonUtils.AnalogyMessageColumn;
+            gridColumnObject.Name = Common.CommonUtils.AnalogyMessageColumn;
+            gridColumnObject.FieldName = Common.CommonUtils.AnalogyMessageColumn;
             bsiProgress.Caption = string.Empty;
             bsiProgress.Visibility = Settings.ShowProcessedCounter ? BarItemVisibility.Always : BarItemVisibility.Never;
             switch (Settings.TimeOffsetType)

Analogy.CommonControls/UserControls/ServerSideLogMessagesUC.cs

@@ -1211,6 +1211,10 @@ private void LoadUISettings()
             gridColumnThread.FieldName = Common.CommonUtils.ColumnThreadId;
             gridColumnProcessID.FieldName = Common.CommonUtils.ColumnProcessId;
             gridColumnModule.FieldName = Common.CommonUtils.ColumnModule;
+            gridColumnBookmarkObject.FieldName = Common.CommonUtils.AnalogyMessageColumn;
+            gridColumnObject.Caption = Common.CommonUtils.AnalogyMessageColumn;
+            gridColumnObject.Name = Common.CommonUtils.AnalogyMessageColumn;
+            gridColumnObject.FieldName = Common.CommonUtils.AnalogyMessageColumn;
 
             bsiProgress.Caption = string.Empty;
             bsiProgress.Visibility = Settings.ShowProcessedCounter ? BarItemVisibility.Always : BarItemVisibility.Never;

Analogy/UserControls/LocalLogFilesUC.cs

@@ -10,6 +10,7 @@
 using DevExpress.Utils.Menu;
 using DevExpress.XtraEditors;
 using DevExpress.XtraTreeList;
+using DevExpress.XtraEditors.Controls;
 
 namespace Analogy.UserControls
 {
@@ -63,7 +64,7 @@ private async void LocalLogFilesUC_Load(object sender, EventArgs e)
             {
                 return;
             }
-
+            SetupEventHandlers();
             folderTreeViewUC1.FolderChanged += FolderTreeViewUC1_FolderChanged;
             ucLogs1.HideRefreshAndScrolling();
             if (extrenalFiles.Any())
@@ -83,7 +84,14 @@ private async void LocalLogFilesUC_Load(object sender, EventArgs e)
             }
             ucLogs1.OnFocusedRowChanged += UcLogs1_OnFocusedRowChanged;
         }
-
+        private void SetupEventHandlers()
+        {
+            sbtnLoadCheckedFiles.Click += async (s, e) =>
+            {
+                var nodes = treeList1.GetAllCheckedNodes().Select(node => (string)node.GetValue(colFullPath)).ToList();
+                await LoadFilesAsync(nodes, chkbSelectionMode.Checked);
+            };
+        }
         private void UcLogs1_OnFocusedRowChanged(object sender, (string file, AnalogyLogMessage e) data)
         {
             if (data.file is null)

Analogy/UserControls/LocalLogFilesUC.resx

@@ -117,10 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>428, 56</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing">
+    <value>428, 56</value>
+  </data>
   <data name="bBtnOpen.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACt0RVh0VGl0
@@ -336,12 +336,13 @@
         l8fBf7dZa9tg1H8BVZPwKK5OWY0AAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib">
     <value>145</value>
-  </metadata>
-  <metadata name="tsPrimary.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  </data>
+  <data name="tsPrimary.TrayLocation" type="System.Drawing.Point, System.Drawing">
     <value>351, 17</value>
-  </metadata>
+  </data>
   <data name="chkbSelectionMode.Properties.ImageOptions.ImageChecked" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABt0RVh0VGl0
@@ -436,53 +437,15 @@
         aGluZU5hbWUGFQAAAAxNYWNoaW5lIE5hbWUB6v////v///8KCgs=
 </value>
   </data>
-  <data name="ucLogs1.ExcludeFilterCriteriaUIOptions" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAI0BQW5hbG9neSwgVmVyc2lvbj00LjYuNC4wLCBDdWx0dXJlPW5l
-        dXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3Vs
-        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5DAMAAAA+QW5hbG9neSwg
-        VmVyc2lvbj00LjYuNC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwFAQAAAEtT
-        eXN0ZW0uQ29sbGVjdGlvbnMuR2VuZXJpYy5MaXN0YDFbW0FuYWxvZ3kuRGF0YVR5cGVzLkZpbHRlckNy
-        aXRlcmlhVUlPcHRpb24DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lvbgQAACpBbmFsb2d5LkRhdGFUeXBl
-        cy5GaWx0ZXJDcml0ZXJpYVVJT3B0aW9uW10DAAAACAgCAAAACQQAAAAHAAAABwAAAAcEAAAAAAEAAAAI
-        AAAABChBbmFsb2d5LkRhdGFUeXBlcy5GaWx0ZXJDcml0ZXJpYVVJT3B0aW9uAwAAAAkFAAAACQYAAAAJ
-        BwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACgUFAAAAKEFuYWxvZ3kuRGF0YVR5cGVzLkZpbHRlckNyaXRl
-        cmlhVUlPcHRpb24DAAAAHjxEaXNwbGF5TWVtYmVyPmtfX0JhY2tpbmdGaWVsZBw8VmFsdWVNZW1iZXI+
-        a19fQmFja2luZ0ZpZWxkHDxDaGVja01lbWJlcj5rX19CYWNraW5nRmllbGQBAQABAwAAAAYMAAAAFURh
-        dGEgU291cmNlL0ZpbGUgTmFtZQYNAAAADERhdGFQcm92aWRlcgABBgAAAAUAAAAGDgAAAAVDbGFzcwkO
-        AAAAAAEHAAAABQAAAAYPAAAACENhdGVnb3J5CQ8AAAAAAQgAAAAFAAAABhAAAAAEVXNlcgkQAAAAAAEJ
-        AAAABQAAAAYRAAAACVByb2Nlc3NJRAkRAAAAAAEKAAAABQAAAAYSAAAACVRocmVhZCBJRAYTAAAACFRo
-        cmVhZElEAAELAAAABQAAAAYUAAAADE1hY2hpbmUgTmFtZQYVAAAAC01hY2hpbmVOYW1lAAs=
-</value>
-  </data>
-  <data name="ucLogs1.IncludeFilterCriteriaUIOptions" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAI0BQW5hbG9neSwgVmVyc2lvbj00LjYuNC4wLCBDdWx0dXJlPW5l
-        dXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3Vs
-        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5DAMAAAA+QW5hbG9neSwg
-        VmVyc2lvbj00LjYuNC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwFAQAAAEtT
-        eXN0ZW0uQ29sbGVjdGlvbnMuR2VuZXJpYy5MaXN0YDFbW0FuYWxvZ3kuRGF0YVR5cGVzLkZpbHRlckNy
-        aXRlcmlhVUlPcHRpb24DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lvbgQAACpBbmFsb2d5LkRhdGFUeXBl
-        cy5GaWx0ZXJDcml0ZXJpYVVJT3B0aW9uW10DAAAACAgCAAAACQQAAAAHAAAABwAAAAcEAAAAAAEAAAAI
-        AAAABChBbmFsb2d5LkRhdGFUeXBlcy5GaWx0ZXJDcml0ZXJpYVVJT3B0aW9uAwAAAAkFAAAACQYAAAAJ
-        BwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACgUFAAAAKEFuYWxvZ3kuRGF0YVR5cGVzLkZpbHRlckNyaXRl
-        cmlhVUlPcHRpb24DAAAAHjxEaXNwbGF5TWVtYmVyPmtfX0JhY2tpbmdGaWVsZBw8VmFsdWVNZW1iZXI+
-        a19fQmFja2luZ0ZpZWxkHDxDaGVja01lbWJlcj5rX19CYWNraW5nRmllbGQBAQABAwAAAAYMAAAAFURh
-        dGEgU291cmNlL0ZpbGUgTmFtZQYNAAAADERhdGFQcm92aWRlcgABBgAAAAUAAAAGDgAAAAVDbGFzcwkO
-        AAAAAAEHAAAABQAAAAYPAAAACENhdGVnb3J5CQ8AAAAAAQgAAAAFAAAABhAAAAAEVXNlcgkQAAAAAAEJ
-        AAAABQAAAAYRAAAACVByb2Nlc3NJRAkRAAAAAAEKAAAABQAAAAYSAAAACVRocmVhZCBJRAYTAAAACFRo
-        cmVhZElEAAELAAAABQAAAAYUAAAADE1hY2hpbmUgTmFtZQYVAAAAC01hY2hpbmVOYW1lAAs=
-</value>
-  </data>
-  <metadata name="imageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="imageList.TrayLocation" type="System.Drawing.Point, System.Drawing">
     <value>453, 17</value>
-  </metadata>
+  </data>
   <data name="imageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS
-        DQAAAk1TRnQBSQFMAgEBBgEAASQBBgEkAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
+        DQAAAk1TRnQBSQFMAgEBBgEAASQBBgEoAQYBEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -537,18 +500,18 @@
         BAAB8AEHAv8EAAH8AT8C/wQAAv8CAAH/AY8E/wIAAf4BDwL/AfABDwIAAfgBDwGAAQEB4AEHAgAB8AEH
         AYABAQHAAQMCAAHgAQMBgAEBAcABAwIAAcABAQGAAQABwAEDAYABAQGAAQEBgAEAAcABAwGAAQEBgAEA
         AYABAAHAAQMBwAEDAgABgAEAAcABAwHgAQcCAAGAAQABwAEDAeABBwIAAYABAAHAAQMB8AEPAQABAQGA
-        AQEB4AEHAfgBHwGAAQMBgAEDAfABDwH4AT8BgAEDAcMD/wH8AT8BwAEHBv8B8AEfAv8L
+        AQEB4AEHAfgBHwGAAQMBgAEDAfABDwH4AT8BgAEDAcMD/wH8AT8BwAEHBv8B8AEfAv8WAAs=
 </value>
   </data>
-  <metadata name="imageListBottom.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="imageListBottom.TrayLocation" type="System.Drawing.Point, System.Drawing">
     <value>256, 56</value>
-  </metadata>
+  </data>
   <data name="imageListBottom.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAc
-        CwAAAk1TRnQBSQFMAgEBAwEAATgBAgE4AQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBAwEAATgBAgE8AQIBEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -595,7 +558,7 @@
         ARADAAEBAQABAQUAAYAXAAP/AQAB8AEPAYABAQGAAQECAAHAAQMBgAEBAcABAQIAAYABAQGAAQEBwAEB
         BAABgAEBAcABAQQAAYABAQHAAQEEAAGAAQEBwAEBBAABgAEBAcABAQQAAYABAQHAAQEEAAGAAQEBwAEB
         BAABgAEBAcABAQQAAYABAQHAAQEEAAGAAQEBwAEBAgABgAEBAYABAQHAAQMCAAHAAQEBgAEBAcABBwIA
-        AeABBwGAAQEBwAEPAgAB8AEPAcABAQH8AR8CAAs=
+        AeABBwGAAQEBwAEPAgAB8AEPAcABAQH8AR8YAAs=
 </value>
   </data>
   <data name="bBtnOpenFolder.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">