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

Console DialogService

Browse Source
This commit is contained in:
Ádám Kovács
2023-08-14 11:50:59 +02:00
parent 6797c26bf9
commit 1f4b938358
41 changed files with 807 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml
View File

@@ -22,8 +22,6 @@
xmlns="https://github.com/avaloniaui"
xmlns:appCoreModels="using:FileTime.App.Core.Models"
xmlns:appInteractions="using:FileTime.App.Core.Interactions"
xmlns:config="using:FileTime.GuiApp.App.Configuration"
xmlns:configuration="clr-namespace:FileTime.App.Core.Configuration;assembly=FileTime.App.Core.Abstraction"
xmlns:corevm="using:FileTime.App.Core.ViewModels"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
@@ -787,7 +785,7 @@
<Border
Background="{DynamicResource BarelyTransparentBackgroundColor}"
HorizontalAlignment="Stretch"
IsVisible="{Binding DialogService.ReadInput^, Converter={x:Static ObjectConverters.IsNotNull}}"
IsVisible="{Binding DialogService.ReadInput.Value, Converter={x:Static ObjectConverters.IsNotNull}}"
VerticalAlignment="Stretch"
x:Name="ReadInputContainer">
<Border
@@ -798,7 +796,7 @@
<Grid RowDefinitions="Auto,Auto,Auto">
<ItemsControl
ItemsSource="{Binding DialogService.ReadInput^.Inputs}"
ItemsSource="{Binding DialogService.ReadInput.Value.Inputs}"
KeyUp="InputList_OnKeyUp"
x:Name="InputList">
<ItemsControl.ItemTemplate>
@@ -839,7 +837,7 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
<ItemsControl Grid.Row="1" ItemsSource="{Binding DialogService.ReadInput^.Previews}">
<ItemsControl Grid.Row="1" ItemsSource="{Binding DialogService.ReadInput.Value.Previews}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid>
@@ -913,7 +911,7 @@
</ItemsControl>
<StackPanel
DataContext="{Binding DialogService.ReadInput^}"
DataContext="{Binding DialogService.ReadInput.Value}"
Grid.Row="2"
Margin="0,10,0,0"
Orientation="Horizontal">
@@ -935,7 +933,7 @@
<Border
Background="{DynamicResource BarelyTransparentBackgroundColor}"
DataContext="{Binding DialogService.LastMessageBox^}"
DataContext="{Binding DialogService.LastMessageBox.Value}"
HorizontalAlignment="Stretch"
IsVisible="{Binding Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}"
VerticalAlignment="Stretch">
@@ -952,12 +950,12 @@
Margin="0,10,0,0"
Orientation="Horizontal">
<Button
Command="{Binding OkCommand}"
Command="{Binding Ok}"
Content="{Binding OkText}"
HorizontalContentAlignment="Center"
Width="80" />
<Button
Command="{Binding CancelCommand}"
Command="{Binding Cancel}"
Content="{Binding CancelText}"
HorizontalContentAlignment="Center"
IsVisible="{Binding ShowCancel}"

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

@@ -20,9 +20,6 @@ public partial class MainWindow : Window, IUiAccessor
private readonly Action? _initializer;
private ILogger<MainWindow>? _logger;
private IModalService? _modalService;
private IReadOnlyCollection<IModalViewModel>? _openModals;
private ReadInputsViewModel? _inputViewModel;
private IDisposable? _inputViewModelSubscription;
private bool _isShuttingDown;
private bool _shutdownCompleted;
private readonly object _isClosingLock = new();
@@ -61,19 +58,9 @@ public partial class MainWindow : Window, IUiAccessor
_logger = DI.ServiceProvider.GetService<ILogger<MainWindow>>();
_modalService = DI.ServiceProvider.GetRequiredService<IModalService>();
_modalService.OpenModals.ToCollection().Subscribe(m => _openModals = m);
DI.ServiceProvider.GetRequiredService<Services.SystemClipboardService>().UiAccessor = this;
DI.ServiceProvider.GetRequiredService<SystemClipboardService>().UiAccessor = this;
ReadInputContainer.PropertyChanged += ReadInputContainerOnPropertyChanged;
DataContextChanged += (_, _) =>
{
if (DataContext is not MainWindowViewModel mainWindowViewModel) return;
_inputViewModelSubscription?.Dispose();
_inputViewModelSubscription = mainWindowViewModel.DialogService.ReadInput.Subscribe(
inputViewModel => _inputViewModel = inputViewModel
);
};
_logger?.LogInformation(
$"{nameof(MainWindow)} opened, starting {nameof(MainWindowViewModel)} initialization...");
@@ -99,7 +86,7 @@ public partial class MainWindow : Window, IUiAccessor
private void OnKeyDown(object sender, KeyEventArgs e)
{
if ((_openModals?.Count ?? 0) > 0) return;
if (_modalService!.OpenModals.Count > 0) return;
ViewModel?.ProcessKeyDown(e);
}
@@ -177,15 +164,14 @@ public partial class MainWindow : Window, IUiAccessor
private void InputList_OnKeyUp(object? sender, KeyEventArgs e)
{
var inputViewModel = ViewModel!.DialogService.ReadInput.Value;
if (e.Key == Key.Escape)
{
_inputViewModel?.Cancel();
_inputViewModel = null;
inputViewModel?.Cancel();
}
else if (e.Key == Key.Enter)
{
_inputViewModel?.Process();
_inputViewModel = null;
inputViewModel?.Process();
}
}