Skip to content

Commit 888a7eb

Browse files
committed
add show providers and lognames(#1,#2)
1 parent 6ff56ee commit 888a7eb

File tree

3 files changed

+39
-16
lines changed

3 files changed

+39
-16
lines changed

src/WEventViewer/OpenLogWindow.axaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,18 @@
4747
Grid.Column="1"
4848
/>
4949
<Button Name="OpenLogButton"
50-
Grid.Column="2"
51-
Content="Open"
52-
IsVisible="{Binding IsEnableFilePathOpenButton}"
53-
Click="OnLogOpenButtonClicked"/>
50+
Grid.Column="2"
51+
Content="Open"
52+
IsVisible="{Binding IsEnableFilePathOpenButton}"
53+
IsEnabled="{Binding IsEnableFilePathOpenButton}"
54+
Click="OnLogOpenButtonClicked"/>
55+
<Button Name="OpenLogNameButton"
56+
Grid.Column="2"
57+
Content="Show LogName"
58+
IsVisible="{Binding IsOpenLogNameButtonEnabled}"
59+
IsEnabled="{Binding IsOpenLogNameButtonEnabled}"
60+
Click="OnShowLogNameClicked"
61+
/>
5462
</Grid>
5563
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" Grid.Row="1">
5664
<Grid.ColumnDefinitions>
@@ -97,7 +105,14 @@
97105
<TimePicker Name="EndTime" SelectedTime="{Binding EndTime}" IsEnabled="{Binding UseEndDate}"/>
98106
</StackPanel>
99107
<CheckBox Content="filter providers(separeted by ',')" Margin="10" IsChecked="{Binding UseProviderNames}"/>
100-
<TextBox Text="{Binding ProviderNames}" IsEnabled="{Binding UseProviderNames}"/>
108+
<Grid>
109+
<Grid.ColumnDefinitions>
110+
<ColumnDefinition Width="*"/>
111+
<ColumnDefinition Width="Auto"/>
112+
</Grid.ColumnDefinitions>
113+
<TextBox Text="{Binding ProviderNames}" IsEnabled="{Binding UseProviderNames}" Grid.Column="0" Margin="10"/>
114+
<Button Content="Show Providers" Grid.Column="1" Margin="10" Click="OnShowProviderNamesClicked"/>
115+
</Grid>
101116
<CheckBox Content="filter by level" Margin="10" IsChecked="{Binding UseFilterByLevel}"/>
102117
<StackPanel Orientation="Horizontal">
103118
<CheckBox Content="Critical" Margin="10" IsChecked="{Binding IsCriticalChecked}" IsEnabled="{Binding UseFilterByLevel}"/>

src/WEventViewer/OpenLogWindow.axaml.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,20 @@ public async void OnLogOpenButtonClicked(object? sender, RoutedEventArgs routedE
3737
}
3838
}
3939
}
40+
public void OnShowLogNameClicked(object? sender, RoutedEventArgs routedEventArgs)
41+
{
42+
var logNameWindow = new LogNameWindow()
43+
{
44+
DataContext = new LogNameViewModel()
45+
};
46+
logNameWindow.Show();
47+
}
48+
public void OnShowProviderNamesClicked(object? sender, RoutedEventArgs routedEventArgs)
49+
{
50+
var w = new ProviderNamesWindow()
51+
{
52+
DataContext = new ProviderNameWindowViewModel()
53+
};
54+
w.Show();
55+
}
4056
}

src/WEventViewer/ViewModel/OpenLogWindowViewModel.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,6 @@ internal partial class OpenLogWindowViewModel : INotifyPropertyChanged
6868
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(LogName)));
6969
}
7070
}
71-
//PathType _PathType = PathType.LogName;
72-
//public PathType PathType
73-
//{
74-
// get => _PathType;
75-
// set
76-
// {
77-
// _PathType = value;
78-
// PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PathType)));
79-
// PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsEnableFilePathOpenButton)));
80-
// }
81-
//}
8271
PathTypeDefinition _CurrentSelected = _PathTypes[0];
8372
public PathTypeDefinition CurrentSelected
8473
{
@@ -88,9 +77,12 @@ public PathTypeDefinition CurrentSelected
8877
_CurrentSelected = value;
8978
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentSelected)));
9079
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsEnableFilePathOpenButton)));
80+
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsOpenLogNameButtonEnabled)));
9181
}
9282
}
9383

84+
public bool IsOpenLogNameButtonEnabled => _CurrentSelected != null && _CurrentSelected.PathType == PathType.LogName;
85+
9486
[RelayCommand]
9587
void OnPathTypeChanged(Avalonia.Controls.SelectionChangedEventArgs evargs)
9688
{

0 commit comments

Comments
 (0)