ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Startup error handling

Browse Source
This commit is contained in:
Ádám Kovács
2023-08-03 11:56:08 +02:00
parent 3304d775f5
commit fe0003e55f
6 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
View File

@@ -53,7 +53,7 @@
<Grid PointerPressed="HeaderPointerPressed">
<Rectangle Fill="#01000000" />
<TextBlock Margin="15,10" Text="{Binding Title}" />
<TextBlock Margin="15,10" Text="{Binding Title.Value}" />
</Grid>
<Grid Grid.Column="1" PointerPressed="HeaderPointerPressed">
@@ -998,7 +998,12 @@
<TextBlock
HorizontalAlignment="Center"
Margin="50"
Text="Loading..." />
Text="{Binding Title.Value}" />
<TextBlock
Foreground="Red"
HorizontalAlignment="Center"
Margin="50"
Text="{Binding FatalError.Value}" />
</StackPanel>
</Grid>
</Grid>

29
src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml.cs
View File

@@ -75,9 +75,22 @@ public partial class MainWindow : Window, IUiAccessor
_logger?.LogInformation(
$"{nameof(MainWindow)} opened, starting {nameof(MainWindowViewModel)} initialization...");
var viewModel = DI.ServiceProvider.GetRequiredService<MainWindowViewModel>();
viewModel.FocusDefaultElement = () => Focus();
ViewModel = viewModel;
try
{
var viewModel = DI.ServiceProvider.GetRequiredService<MainWindowViewModel>();
viewModel.FocusDefaultElement = () => Focus();
ViewModel = viewModel;
}
catch (Exception ex)
{
_logger?.LogError(ex, "Error initializing {ViewModel}", nameof(MainWindowViewModel));
if (DataContext is IMainWindowViewModelBase mainWindowViewModelBase)
{
mainWindowViewModelBase.FatalError.SetValueSafe(
$"Error initializing {nameof(MainWindowViewModel)}: " + ex.Message
);
}
}
}
}
@@ -187,9 +200,9 @@ public partial class MainWindow : Window, IUiAccessor
private async void Child_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{
if (e is {Handled: false, ClickCount: 2}
&& ViewModel != null
&& e.GetCurrentPoint(this).Properties.IsLeftButtonPressed
if (e is {Handled: false, ClickCount: 2}
&& ViewModel != null
&& e.GetCurrentPoint(this).Properties.IsLeftButtonPressed
&& sender is StyledElement {DataContext: IItemViewModel itemViewModel})
{
try
@@ -199,8 +212,8 @@ public partial class MainWindow : Window, IUiAccessor
catch (Exception ex)
{
_logger?.LogError(
ex,
"Error while opening item {Item}",
ex,
"Error while opening item {Item}",
itemViewModel.BaseItem?.FullName?.Path ?? itemViewModel.DisplayNameText
);
}