Exclude source/module/text does not clear the hints text. Fix #259

Analogy-LogViewer · Jul 22, 2020 · 3907813 · 3907813
1 parent 2e4a306
commit 3907813
Show file tree

Hide file tree

Showing 4 changed files with 1,653 additions and 1,648 deletions.
diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs
@@ -10,6 +10,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
         {
             return new List<AnalogyChangeLog>
             {
+                new AnalogyChangeLog("Exclude source/module/text does not clear the hints text. #259",AnalogChangeLogType.Bug,"Lior Banai",new DateTime(2020,07,22)),
                 new AnalogyChangeLog("Allows loading data providers' dependencies from different locations. #184",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,07,20)),
                 new AnalogyChangeLog("Add option to select on which columns the search will be performed. #205",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,07,19)),
                 new AnalogyChangeLog("Support gz archive files. #231",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,07,17)),

diff --git a/Analogy/UserControls/UCLogs.Designer.cs b/Analogy/UserControls/UCLogs.Designer.cs
diff --git a/Analogy/UserControls/UCLogs.cs b/Analogy/UserControls/UCLogs.cs
@@ -823,7 +823,8 @@ private async void tsmiExclude_Click(object sender, EventArgs e)
             if (ef.ShowDialog(this) == DialogResult.OK)
             {
                 string exclude = ef.Exclude;
-                txtbExclude.Text = txtbExclude.Text + "|" + exclude;
+
+                txtbExclude.Text = txtbExclude.Text == txtbExclude.Properties.NullText ? exclude : txtbExclude.Text + "|" + exclude;
                 ceExcludeText.Checked = true;
                 await FilterHasChanged();
             }
@@ -1659,25 +1660,16 @@ private void tsmiExcludeSource_Click(object sender, EventArgs e)
 
             (AnalogyLogMessage message, _) = GetMessageFromSelectedFocusedRowInGrid();
             if (!string.IsNullOrEmpty(message?.Source))
-                txtbSource.Text = txtbSource.Text + ",-" + message.Source;
+                txtbSource.Text = txtbSource.Text == txtbSource.Properties.NullText ? ("-" + message.Source) : txtbSource.Text + ", -" + message.Source;
         }
 
         private void tsmiExcludeModule_Click(object sender, EventArgs e)
         {
             (AnalogyLogMessage message, _) = GetMessageFromSelectedFocusedRowInGrid();
             if (!string.IsNullOrEmpty(message?.Module))
-                txtbModule.Text = txtbModule.Text + ",-" + message.Module;
+                txtbModule.Text = txtbModule.Text == txtbModule.Properties.NullText ? ("-" + message.Module) : txtbModule.Text + ",-" + message.Module;
         }
 
-        private void txtbInclude_KeyDown(object sender, KeyEventArgs e)
-        {
-
-        }
-
-        private void txtbExclude_KeyDown(object sender, KeyEventArgs e)
-        {
-
-        }
 
         private void tsmiTimeDiff_Click(object sender, EventArgs e)
         {
@@ -2543,6 +2535,16 @@ private void tsmiAddCommentToMessage_Click(object sender, EventArgs e)
             }
 
         }
+
+        private void txtbInclude_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            tpFilters.SelectedPage = tpIncludeFilter;
+        }
+
+        private void txtbExclude_EditValueChanged(object sender, EventArgs e)
+        {
+            tpFilters.SelectedPage = tpExcludeFilter;
+        }
     }
 }