feat: Implement LogViewer control and integrate into EditPage
- Added LogViewer control to display log messages with filtering options. - Integrated LogViewer into EditPage for better log management. - Updated EngineEditorWindow to navigate to EditPage. - Enhanced Logger implementation for improved performance and stack trace capturing. - Introduced PathUtility for path normalization. - Refactored AssetManager to correct shader asset type naming. - Removed obsolete AssetHandlerRegistryTests and cleaned up related tests. - Updated ImportCoordinatorTests for streamlined asset import process.
This commit is contained in:
@@ -13,10 +13,6 @@
|
||||
xmlns:sys="using:System"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<UserControl.Resources>
|
||||
<converter:ExplorerItemToIconUriConverter x:Key="ExplorerItemToIconUriConverter" />
|
||||
</UserControl.Resources>
|
||||
|
||||
<Grid MinHeight="50">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
@@ -145,7 +141,7 @@
|
||||
IsDoubleTapEnabled="True"
|
||||
ItemsSource="{x:Bind ViewModel.Files}"
|
||||
SelectionChanged="PART_FilesView_SelectionChanged"
|
||||
SelectionMode="Single">
|
||||
SelectionMode="Extended">
|
||||
<GridView.ItemTemplate>
|
||||
<DataTemplate x:DataType="model:ExplorerItem">
|
||||
<ItemContainer>
|
||||
@@ -171,11 +167,7 @@
|
||||
</Grid.ContextFlyout>
|
||||
|
||||
<community:ConstrainedBox Grid.Row="0" AspectRatio="1:1">
|
||||
<Image HorizontalAlignment="Center">
|
||||
<Image.Source>
|
||||
<BitmapImage DecodePixelWidth="48" UriSource="{x:Bind Converter={StaticResource ExplorerItemToIconUriConverter}}" />
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<FontIcon FontSize="36" Glyph="{x:Bind IconGlyph}" />
|
||||
</community:ConstrainedBox>
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
|
||||
@@ -19,7 +19,7 @@ internal sealed partial class ContentBrowser : UserControl
|
||||
private readonly IInspectorService _inspectorService;
|
||||
private bool _isUpdatingSelection = false;
|
||||
|
||||
public ProjectBrowserViewModel ViewModel
|
||||
public ContentBrowserViewModel ViewModel
|
||||
{
|
||||
get;
|
||||
}
|
||||
@@ -27,7 +27,7 @@ internal sealed partial class ContentBrowser : UserControl
|
||||
public ContentBrowser()
|
||||
{
|
||||
_inspectorService = App.GetService<IInspectorService>();
|
||||
ViewModel = App.GetService<ProjectBrowserViewModel>();
|
||||
ViewModel = App.GetService<ContentBrowserViewModel>();
|
||||
|
||||
InitializeComponent();
|
||||
|
||||
@@ -64,7 +64,7 @@ internal sealed partial class ContentBrowser : UserControl
|
||||
|
||||
private void _inspectorService_OnSelectionChanged(object? sender, InspectorSelectionChangedEventArgs e)
|
||||
{
|
||||
if (e.Source is not ProjectBrowserViewModel)
|
||||
if (e.Source is not ContentBrowserViewModel)
|
||||
{
|
||||
PART_FilesView.DeselectAll();
|
||||
PART_DirectoriesView.SelectedNodes.Clear();
|
||||
@@ -84,7 +84,7 @@ internal sealed partial class ContentBrowser : UserControl
|
||||
if (args.AddedItems.Count > 0 && args.AddedItems[0] is ExplorerItem selectedItem)
|
||||
{
|
||||
ViewModel.SelectedItem = selectedItem;
|
||||
ViewModel.NavigateToDirectory(selectedItem.FullName);
|
||||
ViewModel.NavigateToDirectory(selectedItem.Path);
|
||||
}
|
||||
|
||||
_isUpdatingSelection = false;
|
||||
|
||||
166
src/Editor/Ghost.Editor/Views/Controls/LogViewer.xaml
Normal file
166
src/Editor/Ghost.Editor/Views/Controls/LogViewer.xaml
Normal file
@@ -0,0 +1,166 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<UserControl
|
||||
x:Class="Ghost.Editor.Views.Controls.LogViewer"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:fic="using:FluentIcons.WinUI"
|
||||
xmlns:local="using:Ghost.Editor.Views.Controls"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<UserControl.Resources>
|
||||
<local:LogLevelToColorConverter x:Key="LogLevelToColorConverter" />
|
||||
<local:LogLevelToSymbolConverter x:Key="LogLevelToSymbolConverter" />
|
||||
|
||||
<DataTemplate x:Key="LogItemTemplate">
|
||||
<ItemContainer>
|
||||
<Grid Padding="12,8">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<fic:FluentIcon
|
||||
Margin="0,0,8,0"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{Binding Level, Converter={StaticResource LogLevelToColorConverter}}"
|
||||
Icon="{Binding Level, Converter={StaticResource LogLevelToSymbolConverter}}"
|
||||
IconSize="Size20"
|
||||
IconVariant="Filled" />
|
||||
|
||||
<TextBlock
|
||||
Grid.Column="1"
|
||||
Margin="0,0,8,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Consolas"
|
||||
FontSize="11"
|
||||
Foreground="{StaticResource TextFillColorSecondaryBrush}">
|
||||
<Run Text="[" />
|
||||
<Run Text="{Binding Timestamp}" />
|
||||
<Run Text="]" />
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
Grid.Column="2"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding Message}"
|
||||
TextTrimming="WordEllipsis"
|
||||
TextWrapping="NoWrap" />
|
||||
</Grid>
|
||||
</ItemContainer>
|
||||
</DataTemplate>
|
||||
</UserControl.Resources>
|
||||
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<!-- Toolbar -->
|
||||
<Border
|
||||
Grid.Row="0"
|
||||
Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
|
||||
BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
|
||||
BorderThickness="0,0,0,1">
|
||||
<StackPanel Margin="8,4" Orientation="Horizontal">
|
||||
<Button
|
||||
x:Name="ClearButton"
|
||||
Margin="0,0,8,0"
|
||||
Click="ClearButton_Click"
|
||||
Content="Clear" />
|
||||
<CheckBox
|
||||
x:Name="AutoScrollCheckBox"
|
||||
Margin="0,0,8,0"
|
||||
Content="Auto Scroll"
|
||||
IsChecked="True" />
|
||||
<CheckBox
|
||||
x:Name="ShowStackTraceCheckBox"
|
||||
Margin="0,0,8,0"
|
||||
Checked="ShowStackTraceCheckBox_Checked"
|
||||
Content="Stack Trace"
|
||||
Unchecked="ShowStackTraceCheckBox_Unchecked" />
|
||||
|
||||
<!-- Log level filters -->
|
||||
<TextBlock
|
||||
Margin="16,0,8,0"
|
||||
VerticalAlignment="Center"
|
||||
Text="Show:" />
|
||||
<CheckBox
|
||||
x:Name="ShowInfoCheckBox"
|
||||
Margin="0,0,4,0"
|
||||
Content="Info"
|
||||
IsChecked="True" />
|
||||
<CheckBox
|
||||
x:Name="ShowWarningCheckBox"
|
||||
Margin="0,0,4,0"
|
||||
Content="Warning"
|
||||
IsChecked="True" />
|
||||
<CheckBox
|
||||
x:Name="ShowErrorCheckBox"
|
||||
Margin="0,0,4,0"
|
||||
Content="Error"
|
||||
IsChecked="True" />
|
||||
<CheckBox
|
||||
x:Name="ShowDebugCheckBox"
|
||||
Margin="0,0,4,0"
|
||||
Content="Debug"
|
||||
IsChecked="True" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<Grid Grid.Row="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="0.75*" MaxWidth="1000" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<!-- Log display -->
|
||||
<ScrollView
|
||||
x:Name="LogScrollView"
|
||||
Grid.Column="0"
|
||||
HorizontalScrollBarVisibility="Hidden"
|
||||
HorizontalScrollMode="Disabled"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
VerticalScrollMode="Auto"
|
||||
ZoomMode="Disabled">
|
||||
<ItemsView
|
||||
x:Name="LogItemsView"
|
||||
Padding="4"
|
||||
ItemTemplate="{StaticResource LogItemTemplate}"
|
||||
SelectionChanged="LogItemsView_SelectionChanged" />
|
||||
</ScrollView>
|
||||
|
||||
<ScrollView
|
||||
Grid.Column="1"
|
||||
BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
|
||||
BorderThickness="1,0,0,0"
|
||||
HorizontalScrollMode="Disabled">
|
||||
<StackPanel
|
||||
Padding="12"
|
||||
Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
|
||||
Spacing="8">
|
||||
<TextBlock Style="{StaticResource BodyLargeStrongTextBlockStyle}" Text="Selected Log Details" />
|
||||
<TextBlock
|
||||
Margin="8,0,0,0"
|
||||
Style="{StaticResource BodyStrongTextBlockStyle}"
|
||||
Text="Message:" />
|
||||
<TextBlock
|
||||
x:Name="SelectedLogMessageTextBlock"
|
||||
Margin="16,0,0,0"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBlock
|
||||
Margin="8,0,0,0"
|
||||
Style="{StaticResource BodyStrongTextBlockStyle}"
|
||||
Text="Stack Trace:" />
|
||||
<TextBlock
|
||||
x:Name="SelectedLogStackTraceTextBlock"
|
||||
Margin="16,0,0,0"
|
||||
TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
</ScrollView>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
180
src/Editor/Ghost.Editor/Views/Controls/LogViewer.xaml.cs
Normal file
180
src/Editor/Ghost.Editor/Views/Controls/LogViewer.xaml.cs
Normal file
@@ -0,0 +1,180 @@
|
||||
using FluentIcons.Common;
|
||||
using Ghost.Core;
|
||||
using Microsoft.UI;
|
||||
using Microsoft.UI.Xaml;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Microsoft.UI.Xaml.Data;
|
||||
using Microsoft.UI.Xaml.Media;
|
||||
using System.Collections.ObjectModel;
|
||||
|
||||
namespace Ghost.Editor.Views.Controls;
|
||||
|
||||
public sealed partial class LogViewer : UserControl
|
||||
{
|
||||
private readonly ObservableCollection<LogMessage> _filteredLogs = [];
|
||||
|
||||
public LogViewer()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
LogItemsView.ItemsSource = _filteredLogs;
|
||||
|
||||
Logger.Impl.OnLogAdded += OnLogAdded;
|
||||
Logger.Impl.OnLogsCleared += OnLogCleared;
|
||||
|
||||
// Subscribe to filter changes
|
||||
ShowInfoCheckBox.Checked += OnFilterChanged;
|
||||
ShowInfoCheckBox.Unchecked += OnFilterChanged;
|
||||
ShowWarningCheckBox.Checked += OnFilterChanged;
|
||||
ShowWarningCheckBox.Unchecked += OnFilterChanged;
|
||||
ShowErrorCheckBox.Checked += OnFilterChanged;
|
||||
ShowErrorCheckBox.Unchecked += OnFilterChanged;
|
||||
ShowDebugCheckBox.Checked += OnFilterChanged;
|
||||
ShowDebugCheckBox.Unchecked += OnFilterChanged;
|
||||
|
||||
// Load existing logs
|
||||
RefreshLogs();
|
||||
}
|
||||
|
||||
private void OnLogAdded(LogMessage message)
|
||||
{
|
||||
if (ShouldShowLogItem(message))
|
||||
{
|
||||
DispatcherQueue.TryEnqueue(() =>
|
||||
{
|
||||
_filteredLogs.Add(message);
|
||||
if (AutoScrollCheckBox.IsChecked == true)
|
||||
{
|
||||
LogScrollView.UpdateLayout();
|
||||
LogScrollView.ScrollTo(0.0, LogScrollView.ScrollableHeight);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private void OnLogCleared()
|
||||
{
|
||||
DispatcherQueue.TryEnqueue(_filteredLogs.Clear);
|
||||
}
|
||||
|
||||
private void OnFilterChanged(object sender, RoutedEventArgs e)
|
||||
{
|
||||
RefreshLogs();
|
||||
}
|
||||
|
||||
private bool ShouldShowLogItem(LogMessage message)
|
||||
{
|
||||
return message.Level switch
|
||||
{
|
||||
LogLevel.Info => ShowInfoCheckBox.IsChecked == true,
|
||||
LogLevel.Warning => ShowWarningCheckBox.IsChecked == true,
|
||||
LogLevel.Error => ShowErrorCheckBox.IsChecked == true,
|
||||
LogLevel.Debug => ShowDebugCheckBox.IsChecked == true,
|
||||
_ => true
|
||||
};
|
||||
}
|
||||
|
||||
private void RefreshLogs()
|
||||
{
|
||||
_filteredLogs.Clear();
|
||||
Logger.Info("Message");
|
||||
|
||||
foreach (var log in Logger.Logs)
|
||||
{
|
||||
if (ShouldShowLogItem(log))
|
||||
{
|
||||
_filteredLogs.Add(log);
|
||||
}
|
||||
}
|
||||
|
||||
if (AutoScrollCheckBox.IsChecked == true)
|
||||
{
|
||||
LogScrollView.UpdateLayout();
|
||||
LogScrollView.ScrollTo(0.0, LogScrollView.ScrollableHeight);
|
||||
}
|
||||
}
|
||||
|
||||
private void ClearButton_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Logger.Impl.Clear();
|
||||
}
|
||||
|
||||
private void ShowStackTraceCheckBox_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Logger.Impl.CaptureStackTrace = true;
|
||||
}
|
||||
|
||||
private void ShowStackTraceCheckBox_Unchecked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Logger.Impl.CaptureStackTrace = false;
|
||||
}
|
||||
|
||||
private void LogItemsView_SelectionChanged(ItemsView sender, ItemsViewSelectionChangedEventArgs args)
|
||||
{
|
||||
if (sender.SelectedItem is LogMessage selectedLog)
|
||||
{
|
||||
SelectedLogMessageTextBlock.Text = selectedLog.Message;
|
||||
SelectedLogStackTraceTextBlock.Text = selectedLog.StackTrace ?? "Stack trace not available.";
|
||||
}
|
||||
else
|
||||
{
|
||||
SelectedLogMessageTextBlock.Text = string.Empty;
|
||||
SelectedLogStackTraceTextBlock.Text = string.Empty;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Converter for log level to color
|
||||
public partial class LogLevelToColorConverter : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, string language)
|
||||
{
|
||||
if (value is LogLevel level)
|
||||
{
|
||||
Application.Current.Resources.TryGetValue("SystemFillColorAttentionBrush", out var infoBrush);
|
||||
Application.Current.Resources.TryGetValue("SystemFillColorCautionBrush", out var warningBrush);
|
||||
Application.Current.Resources.TryGetValue("SystemFillColorCriticalBrush", out var errorBrush);
|
||||
Application.Current.Resources.TryGetValue("SystemFillColorNeutralBrush", out var debugBrush);
|
||||
|
||||
return level switch
|
||||
{
|
||||
LogLevel.Info => infoBrush,
|
||||
LogLevel.Warning => warningBrush,
|
||||
LogLevel.Error => errorBrush,
|
||||
LogLevel.Debug => debugBrush,
|
||||
_ => new SolidColorBrush(Colors.Black)
|
||||
};
|
||||
}
|
||||
return new SolidColorBrush(Colors.Black);
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
// Converter for log level to symbol
|
||||
public partial class LogLevelToSymbolConverter : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, string language)
|
||||
{
|
||||
if (value is LogLevel level)
|
||||
{
|
||||
return level switch
|
||||
{
|
||||
LogLevel.Info => Icon.Info,
|
||||
LogLevel.Warning => Icon.Warning,
|
||||
LogLevel.Error => Icon.ErrorCircle,
|
||||
LogLevel.Debug => Icon.Bug,
|
||||
_ => Icon.Info
|
||||
};
|
||||
}
|
||||
return Icon.Info;
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user