aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TUI] Re-enable all dialogs.

Browse Source
This commit is contained in:
Natalia Portillo
2025-11-18 04:47:22 +00:00
parent b580bf0555
commit 6f0ec4546f
3 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Aaru.Tui/ViewModels/Windows/FileViewViewModel.cs
View File

@@ -8,14 +8,18 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Core;
using Aaru.Helpers;
using Aaru.Tui.Models;
using Aaru.Tui.ViewModels.Dialogs;
using Aaru.Tui.Views.Dialogs;
using Aaru.Tui.Views.Windows;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Media;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Humanizer;
using Humanizer.Bytes;
using Prism.DryIoc;
using Spectre.Console;
using Color = Avalonia.Media.Color;
@@ -91,8 +95,13 @@ public sealed partial class FileViewViewModel : ViewModelBase
public string? SelectedFileInformation => SelectedFile?.Information;
Task HelpAsync() =>
/* var dialog = new MainHelpDialog
Task HelpAsync()
{
AvaloniaObject? view = (Application.Current as PrismApplication)?.MainWindow;
if(view is null) return Task.CompletedTask;
var dialog = new MainHelpDialog
{
DataContext = new MainHelpDialogViewModel(null!)
};
@@ -100,11 +109,16 @@ public sealed partial class FileViewViewModel : ViewModelBase
// Set the dialog reference after creation
((MainHelpDialogViewModel)dialog.DataContext!)._dialog = dialog;
return dialog.ShowDialog(_view);*/
Task.CompletedTask;
return dialog.ShowDialog(view as Window);
}
Task GoToPathAsync() =>
/* var dialog = new GoToPathDialog
async Task GoToPathAsync()
{
AvaloniaObject? view = (Application.Current as PrismApplication)?.MainWindow;
if(view is null) return;
var dialog = new GoToPathDialog
{
DataContext = new GoToPathDialogViewModel(null!)
};
@@ -112,7 +126,7 @@ public sealed partial class FileViewViewModel : ViewModelBase
// Set the dialog reference after creation
((GoToPathDialogViewModel)dialog.DataContext!)._dialog = dialog;
bool? result = await dialog.ShowDialog<bool?>(_view);
bool? result = await dialog.ShowDialog<bool?>(view as Window);
if(result == true)
{
@@ -123,8 +137,8 @@ public sealed partial class FileViewViewModel : ViewModelBase
Environment.CurrentDirectory = viewModel.Path;
LoadFiles();
}
}*/
Task.CompletedTask;
}
}
void SectorView()
{

16
Aaru.Tui/ViewModels/Windows/HexViewWindowViewModel.cs
View File

@@ -33,10 +33,11 @@ using Aaru.Tui.ViewModels.Dialogs;
using Aaru.Tui.Views.Dialogs;
using Aaru.Tui.Views.Windows;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Iciclecreek.Avalonia.WindowManager;
using Prism.DryIoc;
using GoToSectorDialog = Aaru.Tui.Views.Dialogs.GoToSectorDialog;
namespace Aaru.Tui.ViewModels.Windows;
@@ -45,7 +46,6 @@ public sealed partial class HexViewWindowViewModel : ViewModelBase
{
private const int BYTES_PER_LINE = 16;
readonly IRegionManager _regionManager;
readonly ManagedWindow _view;
[ObservableProperty]
ulong _currentSector;
[ObservableProperty]
@@ -102,6 +102,10 @@ public sealed partial class HexViewWindowViewModel : ViewModelBase
Task HelpAsync()
{
AvaloniaObject? view = (Application.Current as PrismApplication)?.MainWindow;
if(view is null) return Task.CompletedTask;
var dialog = new HexViewHelpDialog
{
DataContext = new HexViewHelpDialogViewModel(null!)
@@ -110,11 +114,15 @@ public sealed partial class HexViewWindowViewModel : ViewModelBase
// Set the dialog reference after creation
((HexViewHelpDialogViewModel)dialog.DataContext!)._dialog = dialog;
return dialog.ShowDialog(_view);
return dialog.ShowDialog(view as Window);
}
async Task GoToAsync()
{
AvaloniaObject? view = (Application.Current as PrismApplication)?.MainWindow;
if(view is null) return;
var dialog = new GoToSectorDialog
{
DataContext = new GoToSectorDialogViewModel(null!, _imageFormat.Info.Sectors - 1)
@@ -123,7 +131,7 @@ public sealed partial class HexViewWindowViewModel : ViewModelBase
// Set the dialog reference after creation
((GoToSectorDialogViewModel)dialog.DataContext!)._dialog = dialog;
bool? result = await dialog.ShowDialog<bool?>(_view);
bool? result = await dialog.ShowDialog<bool?>(view as Window);
if(result == true)
{

18
Aaru.Tui/ViewModels/Windows/ImageWindowViewModel.cs
View File

@@ -31,14 +31,17 @@ using System.Windows.Input;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
using Aaru.Tui.Models;
using Aaru.Tui.ViewModels.Dialogs;
using Aaru.Tui.Views.Dialogs;
using Aaru.Tui.Views.Windows;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Humanizer;
using Humanizer.Bytes;
using Iciclecreek.Avalonia.WindowManager;
using Prism.DryIoc;
using Partition = Aaru.CommonTypes.Partition;
namespace Aaru.Tui.ViewModels.Windows;
@@ -46,7 +49,6 @@ namespace Aaru.Tui.ViewModels.Windows;
public sealed partial class ImageWindowViewModel : ViewModelBase
{
readonly IRegionManager _regionManager;
readonly ManagedWindow _view;
[ObservableProperty]
public string _filePath;
[ObservableProperty]
@@ -177,8 +179,12 @@ public sealed partial class ImageWindowViewModel : ViewModelBase
_ = Task.Run(Worker);
}
Task HelpAsync() =>
/*
Task HelpAsync()
{
AvaloniaObject? view = (Application.Current as PrismApplication)?.MainWindow;
if(view is null) return Task.CompletedTask;
var dialog = new ImageHelpDialog
{
DataContext = new ImageHelpDialogViewModel(null!)
@@ -187,8 +193,8 @@ public sealed partial class ImageWindowViewModel : ViewModelBase
// Set the dialog reference after creation
((ImageHelpDialogViewModel)dialog.DataContext!)._dialog = dialog;
return dialog.ShowDialog(_view);*/
Task.CompletedTask;
return dialog.ShowDialog(view as Window);
}
void Worker()
{