[BUG] pre defined popup menu is opened at incorrect position. #1308

Analogy-LogViewer · Jun 4, 2022 · c8a796e · c8a796e
1 parent c1b38a6
commit c8a796e
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 99 deletions.
diff --git a/Analogy/ApplicationSettings/PredefinedFiltersUC.Designer.cs b/Analogy/ApplicationSettings/PredefinedFiltersUC.Designer.cs
diff --git a/Analogy/ApplicationSettings/PredefinedFiltersUC.cs b/Analogy/ApplicationSettings/PredefinedFiltersUC.cs
@@ -29,7 +29,7 @@ private void SetupEventsHandlers()
         {
             sbtnAddFilter.Click += (s, e) =>
             {
-                Settings.PreDefinedQueries.AddFilter(txtbIncludeTextFilter.Text, txtbExcludeFilter.Text,
+                Settings.PreDefinedQueries.AddFilter(teName.Text,txtbIncludeTextFilter.Text, txtbExcludeFilter.Text,
                     txtbSourcesFilter.Text, txtbModulesFilter.Text);
                 lboxFilters.DataSource = Settings.PreDefinedQueries.Filters;
                 lboxFilters.Refresh();
@@ -50,5 +50,7 @@ private void LoadSettings()
         {
             lboxFilters.DataSource = Settings.PreDefinedQueries.Filters;
         }
+
+
     }
 }
diff --git a/Analogy/Managers/UserSettingsManager.cs b/Analogy/Managers/UserSettingsManager.cs
@@ -884,7 +884,7 @@ public PreDefinedQueries()
         }
 
         public void AddHighlight(string text, PreDefinedQueryType type, Color color) => Highlights.Add(new PreDefineHighlight(type, text, color));
-        public void AddFilter(string includeText, string excludeText, string sources, string modules) => Filters.Add(new PreDefineFilter(includeText, excludeText, sources, modules));
+        public void AddFilter(string name,string includeText, string excludeText, string sources, string modules) => Filters.Add(new PreDefineFilter(name,includeText, excludeText, sources, modules));
         public void AddAlert(string includeText, string excludeText, string sources, string modules) => Alerts.Add(new PreDefineAlert(includeText, excludeText, sources, modules));
 
         public void RemoveHighlight(PreDefineHighlight highlight)
@@ -932,14 +932,16 @@ public override string ToString()
     [Serializable]
     public class PreDefineFilter
     {
+        public string Name { get; set; }
         public string IncludeText { get; }
         public string ExcludeText { get; }
         public string Sources { get; }
         public string Modules { get; }
 
 
-        public PreDefineFilter(string includeText, string excludeText, string sources, string modules)
+        public PreDefineFilter(string name, string includeText, string excludeText, string sources, string modules)
         {
+            Name = name ?? string.Empty;
             IncludeText = includeText ?? string.Empty;
             ExcludeText = excludeText ?? string.Empty;
             Sources = sources ?? string.Empty;
@@ -949,6 +951,10 @@ public override string ToString()
         {
             return $"Filter: Message Text:{IncludeText}. Exclude:{ExcludeText}. Sources:{Sources}. Modules:{Modules}";
         }
+
+        public string NiceText() =>
+            $"Message Text: {IncludeText}{Environment.NewLine}Exclude Text: {ExcludeText}{Environment.NewLine}Sources: {Sources}{Environment.NewLine}Module: {Modules}";
+
     }
 }
 
diff --git a/Analogy/UserControls/UCLogs.Designer.cs b/Analogy/UserControls/UCLogs.Designer.cs