add file picker for evtx

itn3000 · itn3000 · commit 788aff19f2a6 · 2024-07-30T14:10:19.000+09:00
diff --git a/src/WEventViewer/AboutWindow.axaml b/src/WEventViewer/AboutWindow.axaml
@@ -0,0 +1,24 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="using:WEventViewer.ViewModel"
+        mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="200"
+        x:Class="WEventViewer.AboutWindow"
+        x:DataType="vm:AboutViewModel"
+        Width="300"
+        Height="200"
+        Title="AboutWindow">
+  <Design.DataContext>
+    <vm:AboutViewModel/>
+  </Design.DataContext>
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+    </Grid.RowDefinitions>
+    
+    <Label Content="{Binding Name}" Grid.Row="0" HorizontalAlignment="Center" Margin="20"/>
+    <Label Content="{Binding Version}" Grid.Row="1" HorizontalAlignment="Center" Margin="20"/>
+  </Grid>
+</Window>
diff --git a/src/WEventViewer/AboutWindow.axaml.cs b/src/WEventViewer/AboutWindow.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace WEventViewer;
+
+public partial class AboutWindow : Window
+{
+    public AboutWindow()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/WEventViewer/App.axaml.cs b/src/WEventViewer/App.axaml.cs
@@ -25,6 +25,7 @@ public override void OnFrameworkInitializationCompleted()
         collection.AddTransient<OpenLogWindow>();
         collection.AddTransient<ProviderNameWindowViewModel>();
         collection.AddTransient<LogNameViewModel>();
+        collection.AddTransient<AboutViewModel>();
         var serviceProvider = collection.BuildServiceProvider();
         var vm = serviceProvider.GetRequiredService<MainWindowViewModel>();
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
diff --git a/src/WEventViewer/ErrorWindow.axaml b/src/WEventViewer/ErrorWindow.axaml
@@ -17,6 +17,6 @@
 		<ScrollViewer AllowAutoHide="True" VerticalScrollBarVisibility="Auto" Margin="10">
 			<TextBlock Text="{Binding Message}" TextWrapping="WrapWithOverflow"/>
 		</ScrollViewer>
-		<Button Content="Close" Margin="10"/>
+		<Button Content="Close" Margin="10" Command="{Binding CloseCommand}"/>
 	</StackPanel>
 </Window>
diff --git a/src/WEventViewer/LogNameWindow.axaml b/src/WEventViewer/LogNameWindow.axaml
@@ -19,10 +19,14 @@
 			<RowDefinition Height="Auto"></RowDefinition>
 		</Grid.RowDefinitions>
 		<Label Content="LogNames" Grid.Row="0" Margin="10"/>
-		<StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Stretch">
-			<Label Content="Search:" Margin="10" VerticalAlignment="Center"/>
-			<TextBox Text="{Binding SearchString}" Margin="10" VerticalAlignment="Center"/>
-		</StackPanel>
+		<Grid Grid.Row="1" HorizontalAlignment="Stretch">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto"/>
+        <ColumnDefinition Width="*"/>
+      </Grid.ColumnDefinitions>
+      <Label Content="Search:" Margin="10" VerticalAlignment="Center" Grid.Column="0"/>
+			<TextBox Text="{Binding SearchString}" Margin="10" VerticalAlignment="Center" Grid.Column="1"/>
+		</Grid>
 		<ScrollViewer Grid.Row="2">
 			<ListBox Name="LogNames" ItemsSource="{Binding LogNames}" MaxHeight="{Binding $parent.Bounds.Height}">
 				<ListBox.ItemTemplate>
diff --git a/src/WEventViewer/MainWindow.axaml b/src/WEventViewer/MainWindow.axaml
@@ -22,7 +22,7 @@
 				<MenuItem Header="Show _LogNames" Name="PrintLogNames" Click="PrintLogNamesClick"/>
 				<MenuItem Header="_Close" Command="{Binding CloseCommand}"/>
 			</MenuItem>
-			<MenuItem Header="_About"/>
+			<MenuItem Header="_About" Click="AboutClick"/>
 			
 		</Menu>
 		<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="20" MinHeight="200" MinWidth="200" Height="{Binding Mode=OneWay,Path=ScrollViewerHeight}" Name="LogViewer">
diff --git a/src/WEventViewer/MainWindow.axaml.cs b/src/WEventViewer/MainWindow.axaml.cs
@@ -75,7 +75,7 @@ private void PrintProviderClick(object? sender, Avalonia.Interactivity.RoutedEve
         {
             var vm = serviceProvider.GetService<ProviderNameWindowViewModel>();
             var w = new ProviderNamesWindow() { DataContext = vm };
-            w.Show(this);
+            w.Show();
         }
 
     }
@@ -86,6 +86,16 @@ private void PrintLogNamesClick(object? sender, RoutedEventArgs e)
         {
             var vm = serviceProvider.GetService<LogNameViewModel>();
             var w = new LogNameWindow() { DataContext = vm };
+            w.Show();
+        }
+    }
+
+    private void AboutClick(object? sender, RoutedEventArgs e)
+    {
+        if (serviceProvider != null)
+        {
+            var vm = serviceProvider.GetService<AboutViewModel>();
+            var w = new AboutWindow() { DataContext = vm };
             w.Show(this);
         }
     }
diff --git a/src/WEventViewer/OpenLogWindow.axaml b/src/WEventViewer/OpenLogWindow.axaml
@@ -20,44 +20,62 @@
 			<RowDefinition Height="Auto"></RowDefinition>
 		</Grid.RowDefinitions>
 		<StackPanel Margin="10" Orientation="Vertical" Grid.Row="0" Name="OptionPanel">
-			<StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Grid.Row="0" VerticalAlignment="Center">
+			<Grid HorizontalAlignment="Stretch" Grid.Row="0" VerticalAlignment="Center">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto"/>
+          <ColumnDefinition Width="*"/>
+          <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
 				<Label Content="LogName"
-					   Margin="10,10,10,10"
-					   HorizontalAlignment="Left"
-					   VerticalAlignment="Center"
+					     Margin="10,10,10,10"
+					     VerticalAlignment="Center"
+               HorizontalAlignment="Left"
+               Grid.Column="0"
 				   />
 				<TextBox HorizontalContentAlignment="Left"
-						 VerticalContentAlignment="Center"
-						 TextAlignment="Left"
-						 Margin="10,10,10,10"
-						 HorizontalAlignment="Right"
-						 Text="{Binding LogName, Mode=TwoWay}"
-						 MinWidth="200" MaxWidth="1000"
+						     VerticalContentAlignment="Center"
+                 HorizontalAlignment="Stretch"
+						     TextAlignment="Left"
+						     Margin="10,10,10,10"
+						     Text="{Binding LogName, Mode=TwoWay}"
+						     MinWidth="200" MaxWidth="1000"
+                 Grid.Column="1"
 					 />
-			</StackPanel>
-			<StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Center">
+        <Button Name="OpenLogButton" 
+                Grid.Column="2" 
+                Content="Open" 
+                IsVisible="{Binding IsEnableFilePathOpenButton}"
+                Click="OnLogOpenButtonClicked"/>
+			</Grid>
+			<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto"/>
+          <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
 				<Label Content="PathType"
-					   Margin="10,10,10,10"
-					   HorizontalAlignment="Left"
-					   VerticalAlignment="Center"/>
+					     Margin="10,10,10,10"
+					     HorizontalAlignment="Left"
+					     VerticalAlignment="Center"
+               Grid.Column="0"/>
 				<!--<TextBox Margin="10,10,10,10" 
 					 HorizontalAlignment="Stretch" 
 					 TextAlignment="Left" 
 					 VerticalContentAlignment="Center"
 					 Text="{Binding Path=PathType, Mode=TwoWay,Converter={StaticResource PathTypeConverter}}"/>-->
-				<ComboBox
+        <ComboBox
 					HorizontalAlignment="Stretch"
 					Margin="10"
 					ItemsSource="{Binding PathTypes}"
 					SelectedValue="{Binding CurrentSelected}"
+          Grid.Column="1"
 				>
 					<ComboBox.ItemTemplate>
 						<DataTemplate>
 							<Label Content="{Binding DisplayName}"/>
 						</DataTemplate>
 					</ComboBox.ItemTemplate>
 				</ComboBox>
-			</StackPanel>
+			</Grid>
 			<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" MaxHeight="300" MaxWidth="{Binding #OptionPanel.Bounds.Width}">
 				<StackPanel Orientation="Vertical" Margin="10">
 					<CheckBox Name="UseRawQuery" Content="raw query" Margin="10" IsChecked="{Binding UseRawQuery}"/>
diff --git a/src/WEventViewer/OpenLogWindow.axaml.cs b/src/WEventViewer/OpenLogWindow.axaml.cs
@@ -1,7 +1,11 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.Messaging;
+using Avalonia.Platform.Storage;
+using WEventViewer.ViewModel;
+using System.Collections.Generic;
 
 namespace WEventViewer;
 
@@ -16,4 +20,21 @@ public OpenLogWindow()
             this.Close(msg.isOk);
         });
     }
+    public async void OnLogOpenButtonClicked(object? sender, RoutedEventArgs routedEventArgs)
+    {
+        var topLevel = TopLevel.GetTopLevel(this);
+        if (topLevel != null && DataContext is OpenLogWindowViewModel vm)
+        {
+            var files = await topLevel.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions()
+            {
+                Title = "Open exported log file",
+                AllowMultiple = false,
+                SuggestedFileName = "*.evtx"
+,            });
+            if (files != null && files.Count != 0)
+            {
+                vm.LogName = files[0].Path.LocalPath;
+            }
+        }
+    }
 }
diff --git a/src/WEventViewer/ProviderNamesWindow.axaml b/src/WEventViewer/ProviderNamesWindow.axaml
@@ -19,10 +19,14 @@
 			<RowDefinition Height="Auto"></RowDefinition>
 		</Grid.RowDefinitions>
 		<Label Content="Providers" Grid.Row="0" Margin="10"/>
-		<StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Stretch">
-			<Label Content="Search:" Margin="10" VerticalAlignment="Center"/>
-			<TextBox Text="{Binding SearchString}" Margin="10" VerticalAlignment="Center"/>
-		</StackPanel>
+		<Grid Grid.Row="1" HorizontalAlignment="Stretch">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto"/>
+        <ColumnDefinition Width="*"/>
+      </Grid.ColumnDefinitions>
+			<Label Content="Search:" Margin="10" VerticalAlignment="Center" Grid.Column="0"/>
+			<TextBox Text="{Binding SearchString}" Margin="10" VerticalAlignment="Center" Grid.Column="1"/>
+		</Grid>
 		<ScrollViewer Grid.Row="2">
 			<ListBox Name="Providers" ItemsSource="{Binding Providers}" MaxHeight="{Binding $parent.Bounds.Height}">
 				<ListBox.ItemTemplate>
diff --git a/src/WEventViewer/ViewModel/AboutViewModel.cs b/src/WEventViewer/ViewModel/AboutViewModel.cs
@@ -0,0 +1,22 @@
+﻿using Avalonia.Controls;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WEventViewer.ViewModel
+{
+    internal class AboutViewModel
+    {
+        public AboutViewModel()
+        {
+            var asmname = typeof(AboutViewModel).Assembly.GetName();
+            Name = "Windows EventLog Viewer";
+            Version = asmname.Version != null ? asmname.Version.ToString() : string.Empty;
+        }
+        public string Name { get; set; }
+        public string Version { get; set; }
+    }
+}
diff --git a/src/WEventViewer/ViewModel/OpenLogWindowViewModel.cs b/src/WEventViewer/ViewModel/OpenLogWindowViewModel.cs
@@ -68,16 +68,17 @@ internal partial class OpenLogWindowViewModel : INotifyPropertyChanged
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(LogName)));
             }
         }
-        PathType _PathType = PathType.LogName;
-        public PathType PathType
-        {
-            get => _PathType;
-            set
-            {
-                _PathType = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PathType)));
-            }
-        }
+        //PathType _PathType = PathType.LogName;
+        //public PathType PathType
+        //{
+        //    get => _PathType;
+        //    set
+        //    {
+        //        _PathType = value;
+        //        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PathType)));
+        //        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsEnableFilePathOpenButton)));
+        //    }
+        //}
         PathTypeDefinition _CurrentSelected = _PathTypes[0];
         public PathTypeDefinition CurrentSelected
         {
@@ -86,6 +87,7 @@ public PathTypeDefinition CurrentSelected
             {
                 _CurrentSelected = value;
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentSelected)));
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsEnableFilePathOpenButton)));
             }
         }
 
@@ -125,6 +127,7 @@ public void OnSizeChanged(int WindowWidth)
             LogNameWidth = WindowWidth;
         }
         public int LogNameWidth { get; set; }
+        public bool IsEnableFilePathOpenButton => CurrentSelected != null ? CurrentSelected.PathType == PathType.FilePath : false;
         bool _UseRawQuery = false;
         public bool UseRawQuery
         {
@@ -139,9 +142,11 @@ public bool UseRawQuery
                     {
                         PropertyChanged(this, new PropertyChangedEventArgs(nameof(UseRawQuery)));
                     }
-                    if (_UseRawQuery && _UseTimeCreated)
+                    if (_UseRawQuery)
                     {
-                        UseTimeCreated = false;
+                        UseBeginDate = false;
+                        UseEndDate = false;
+                        UseProviderNames = false;
                     }
                 }
             }
diff --git a/src/WEventViewer/WEventViewer.csproj b/src/WEventViewer/WEventViewer.csproj
@@ -6,6 +6,7 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <Version>0.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ private void PrintProviderClick(object? sender, Avalonia.Interactivity.RoutedEve`
`75`	`75`	`{`
`76`	`76`	`var vm = serviceProvider.GetService<ProviderNameWindowViewModel>();`
`77`	`77`	`var w = new ProviderNamesWindow() { DataContext = vm };`
`78`		`- w.Show(this);`
	`78`	`+ w.Show();`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`}`
`@@ -86,6 +86,16 @@ private void PrintLogNamesClick(object? sender, RoutedEventArgs e)`
`86`	`86`	`{`
`87`	`87`	`var vm = serviceProvider.GetService<LogNameViewModel>();`
`88`	`88`	`var w = new LogNameWindow() { DataContext = vm };`
	`89`	`+ w.Show();`
	`90`	`+ }`
	`91`	`+ }`
	`92`	`+`
	`93`	`+ private void AboutClick(object? sender, RoutedEventArgs e)`
	`94`	`+ {`
	`95`	`+ if (serviceProvider != null)`
	`96`	`+ {`
	`97`	`+ var vm = serviceProvider.GetService<AboutViewModel>();`
	`98`	`+ var w = new AboutWindow() { DataContext = vm };`
`89`	`99`	`w.Show(this);`
`90`	`100`	`}`
`91`	`101`	`}`