add filter by level options(size alignment needed)

Author: itn3000

src/WEventViewer/MainWindow.axaml

@@ -40,6 +40,7 @@
 
 					<DataGridTextColumn Header="TimeCreated" Binding="{Binding TimeCreated}"/>
 					<DataGridTextColumn Header="LogName" Binding="{Binding LogName}"/>
+          <DataGridTextColumn Header="Provider" Binding="{Binding ProviderName}"/>
 					<DataGridTextColumn Header="Id" Binding="{Binding Id}"/>
 					<DataGridTextColumn Header="Level" Binding="{Binding Level}"/>
 					<DataGridTextColumn Header="Description" Binding="{Binding Formatted}"/>

src/WEventViewer/OpenLogWindow.axaml

@@ -93,15 +93,15 @@
 					</StackPanel>
 					<CheckBox Content="filter providers(separeted by ',')" Margin="10" IsChecked="{Binding UseProviderNames}"/>
 					<TextBox Text="{Binding ProviderNames}" IsEnabled="{Binding UseProviderNames}"/>
-					<CheckBox Content="filter by level" Margin="10"/>
-					<StackPanel Orientation="Horizontal">
-						<CheckBox Content="Critical" Margin="10"/>
-						<CheckBox Content="Error" Margin="10"/>
-						<CheckBox Content="Warning" Margin="10"/>
-						<CheckBox Content="Information" Margin="10"/>
-						<CheckBox Content="Verbose" Margin="10"/>
-					</StackPanel>
-				</StackPanel>
+          <CheckBox Content="filter by level" Margin="10" IsChecked="{Binding UseFilterByLevel}"/>
+          <StackPanel Orientation="Horizontal">
+            <CheckBox Content="Critical" Margin="10" IsChecked="{Binding IsCriticalChecked}" IsEnabled="{Binding UseFilterByLevel}"/>
+            <CheckBox Content="Error" Margin="10" IsChecked="{Binding IsErrorChecked}" IsEnabled="{Binding UseFilterByLevel}"/>
+            <CheckBox Content="Warning" Margin="10" IsChecked="{Binding IsWarningChecked}" IsEnabled="{Binding UseFilterByLevel}"/>
+            <CheckBox Content="Information" Margin="10" IsChecked="{Binding IsInformationChecked}" IsEnabled="{Binding UseFilterByLevel}"/>
+            <CheckBox Content="Verbose" Margin="10" IsChecked="{Binding IsVerboseChecked}" IsEnabled="{Binding UseFilterByLevel}"/>
+          </StackPanel>
+        </StackPanel>
 			</ScrollViewer>
 			<!--<Expander Header="Advanced" Grid.Row="2" HorizontalAlignment="Stretch" MaxHeight="300">
 			</Expander>-->

src/WEventViewer/ViewModel/OpenLogWindowViewModel.cs

@@ -147,6 +147,7 @@ public bool UseRawQuery
                         UseBeginDate = false;
                         UseEndDate = false;
                         UseProviderNames = false;
+                        UseFilterByLevel = false;
                     }
                 }
             }
@@ -184,6 +185,34 @@ string BuildQuery()
                     var providerConditions = string.Join(" or ", ProviderNames.Split(',').Select(x => $"@Name = '{x.Trim()}'"));
                     conditions.Add($"Provider[{providerConditions}]");
                 }
+                if (UseFilterByLevel)
+                {
+                    var levelConditions = new List<string>();
+                    if(IsCriticalChecked)
+                    {
+                        levelConditions.Add("Level=1");
+                    }
+                    if(IsErrorChecked)
+                    {
+                        levelConditions.Add("Level=2");
+                    }
+                    if(IsWarningChecked)
+                    {
+                        levelConditions.Add("Level=3");
+                    }
+                    if(IsInformationChecked)
+                    {
+                        levelConditions.Add("Level=4");
+                    }
+                    if(IsVerboseChecked)
+                    {
+                        levelConditions.Add("Level=5");
+                    }
+                    if (levelConditions.Count > 0)
+                    {
+                        conditions.Add($"({string.Join(" or ", levelConditions)})");
+                    }
+                }
                 if (conditions.Count > 0)
                 {
                     return $"*[System[{string.Join(" and ", conditions)}]]";
@@ -304,5 +333,28 @@ public bool UseProviderNames
             }
         }
         public string ProviderNames { get; set; } = string.Empty;
+        bool _UseFilterByLevel = false;
+        public bool UseFilterByLevel
+        {
+            get => _UseFilterByLevel;
+            set
+            {
+                var changed = _UseFilterByLevel != value;
+                _UseFilterByLevel = value;
+                if (changed)
+                {
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(UseFilterByLevel)));
+                    if(UseRawQuery && value)
+                    {
+                        UseRawQuery = false;
+                    }
+                }
+            }
+        }
+        public bool IsCriticalChecked { get; set; } = false;
+        public bool IsErrorChecked { get; set; } = false;
+        public bool IsWarningChecked { get; set; } = false;
+        public bool IsInformationChecked { get; set; } = false;
+        public bool IsVerboseChecked {  get; set; } = false;
     }
 }