aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-07-08 18:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MessageBox invocation in GUI.

Browse Source
This commit is contained in:
Natalia Portillo
2023-09-26 01:29:07 +01:00
parent 95046ee7b8
commit 06edf51ebc
7 changed files with 128 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
View File

@@ -42,8 +42,8 @@ using Aaru.Console;
using Aaru.Localization;
using Avalonia.Controls;
using JetBrains.Annotations;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using ReactiveUI;
using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
using Version = Aaru.CommonTypes.Interop.Version;
@@ -153,12 +153,11 @@ public sealed class ConsoleViewModel : ViewModelBase
}
catch(Exception exception)
{
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
string.
Format(UI.Exception_0_trying_to_save_logfile_details_has_been_sent_to_console,
exception.Message), ButtonEnum.Ok, Icon.Error).
ShowDialog(_view);
await MessageBoxManager.GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Exception_0_trying_to_save_logfile_details_has_been_sent_to_console,
exception.Message), ButtonEnum.Ok, Icon.Error).
ShowWindowDialogAsync(_view);
AaruConsole.ErrorWriteLine("Console", exception.Message);
AaruConsole.ErrorWriteLine("Console", exception.StackTrace);

24
Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
View File

@@ -45,8 +45,8 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Media.Imaging;
using Avalonia.Platform;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using ReactiveUI;
using ScsiInfo = Aaru.Core.Media.Info.ScsiInfo;
@@ -415,17 +415,17 @@ public sealed class MediaInfoViewModel : ViewModelBase
{
case CommonTypes.MediaType.GDR or CommonTypes.MediaType.GDROM:
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
Localization.Core.GD_ROM_dump_support_is_not_yet_implemented,
ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
ButtonEnum.Ok, Icon.Error).ShowWindowDialogAsync(_view);
return;
case CommonTypes.MediaType.XGD or CommonTypes.MediaType.XGD2 or CommonTypes.MediaType.XGD3
when _scsiInfo.DeviceInfo.ScsiInquiry?.KreonPresent != true:
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
Localization.Core.Dumping_Xbox_discs_require_a_Kreon_drive,
ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
ButtonEnum.Ok, Icon.Error).ShowWindowDialogAsync(_view);
return;
}
@@ -446,9 +446,9 @@ public sealed class MediaInfoViewModel : ViewModelBase
case CommonTypes.MediaType.GDR:
case CommonTypes.MediaType.GDROM:
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
Localization.Core.GD_ROM_scan_support_is_not_yet_implemented,
ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
ButtonEnum.Ok, Icon.Error).ShowWindowDialogAsync(_view);
return;
@@ -456,10 +456,10 @@ public sealed class MediaInfoViewModel : ViewModelBase
case CommonTypes.MediaType.XGD:
case CommonTypes.MediaType.XGD2:
case CommonTypes.MediaType.XGD3:
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
Localization.Core.Scanning_Xbox_discs_is_not_yet_supported,
ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
await MessageBoxManager.GetMessageBoxStandard(UI.Title_Error,
Localization.Core.
Scanning_Xbox_discs_is_not_yet_supported,
ButtonEnum.Ok, Icon.Error).ShowWindowDialogAsync(_view);
return;
}

47
Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
View File

@@ -47,8 +47,8 @@ using Aaru.Gui.Models;
using Aaru.Localization;
using Avalonia.Controls;
using JetBrains.Annotations;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using ReactiveUI;
using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
@@ -71,11 +71,10 @@ public sealed class SubdirectoryViewModel
if(errno != ErrorNumber.NoError)
{
MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error,
string.
Format(UI.Error_0_trying_to_read_1_of_chosen_filesystem,
errno, model.Path), ButtonEnum.Ok, Icon.Error).
ShowDialog(view);
MessageBoxManager.GetMessageBoxStandard(UI.Title_Error,
string.Format(UI.Error_0_trying_to_read_1_of_chosen_filesystem,
errno, model.Path), ButtonEnum.Ok, Icon.Error).
ShowWindowDialogAsync(view);
return;
}
@@ -268,13 +267,12 @@ public sealed class SubdirectoryViewModel
string corrected = new(chars);
mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow(UI.Unsupported_filename,
string.
Format(UI.Filename_0_not_supported_want_to_rename_to_1,
filename,
corrected), ButtonEnum.YesNoCancel,
Icon.Warning).
ShowDialog(_view);
mboxResult = await MessageBoxManager.GetMessageBoxStandard(UI.Unsupported_filename,
string.
Format(UI.Filename_0_not_supported_want_to_rename_to_1,
filename, corrected),
ButtonEnum.YesNoCancel, Icon.Warning).
ShowWindowDialogAsync(_view);
switch(mboxResult)
{
@@ -291,9 +289,9 @@ public sealed class SubdirectoryViewModel
if(File.Exists(outputPath))
{
mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow(UI.Existing_file,
mboxResult = await MessageBoxManager.GetMessageBoxStandard(UI.Existing_file,
string.Format(UI.File_named_0_exists_overwrite_Q, filename),
ButtonEnum.YesNoCancel, Icon.Warning).ShowDialog(_view);
ButtonEnum.YesNoCancel, Icon.Warning).ShowWindowDialogAsync(_view);
switch(mboxResult)
{
@@ -306,9 +304,9 @@ public sealed class SubdirectoryViewModel
}
catch(IOException)
{
mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow(UI.Cannot_delete,
mboxResult = await MessageBoxManager.GetMessageBoxStandard(UI.Cannot_delete,
UI.Could_note_delete_existe_file_continue_Q, ButtonEnum.YesNo,
Icon.Error).ShowDialog(_view);
Icon.Error).ShowWindowDialogAsync(_view);
if(mboxResult == ButtonResult.No)
return;
@@ -332,9 +330,9 @@ public sealed class SubdirectoryViewModel
if(error != ErrorNumber.NoError)
{
mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow(UI.Error_reading_file,
mboxResult = await MessageBoxManager.GetMessageBoxStandard(UI.Error_reading_file,
string.Format(UI.Error_0_reading_file_continue_Q, error), ButtonEnum.YesNo,
Icon.Error).ShowDialog(_view);
Icon.Error).ShowWindowDialogAsync(_view);
if(mboxResult == ButtonResult.No)
return;
@@ -381,10 +379,11 @@ public sealed class SubdirectoryViewModel
}
catch(IOException)
{
mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow(UI.Cannot_create_file,
UI.Could_not_create_destination_file_continue_Q,
ButtonEnum.YesNo, Icon.Error).
ShowDialog(_view);
mboxResult = await MessageBoxManager.GetMessageBoxStandard(UI.Cannot_create_file,
UI.
Could_not_create_destination_file_continue_Q,
ButtonEnum.YesNo, Icon.Error).
ShowWindowDialogAsync(_view);
if(mboxResult == ButtonResult.No)
return;

118
Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
View File

@@ -53,8 +53,8 @@ using Aaru.Gui.Models;
using Aaru.Localization;
using Avalonia.Controls;
using Avalonia.Threading;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using ReactiveUI;
using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo;
using Track = Aaru.CommonTypes.Structs.Track;
@@ -594,8 +594,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
if(SelectedPlugin is null)
{
await MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, UI.Error_trying_to_find_selected_plugin,
icon: Icon.Error).ShowDialog(_view);
await MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, UI.Error_trying_to_find_selected_plugin,
icon: Icon.Error).ShowWindowDialogAsync(_view);
return;
}
@@ -610,8 +610,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
if(plugin is not IWritableImage outputFormat)
{
await MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, UI.Error_trying_to_find_selected_plugin,
icon: Icon.Error).ShowDialog(_view);
await MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, UI.Error_trying_to_find_selected_plugin,
icon: Icon.Error).ShowWindowDialogAsync(_view);
return;
}
@@ -715,12 +715,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
!outputFormat.SupportedMediaTags.Contains(mediaTag) && !ForceChecked))
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Converting_image_will_lose_media_tag_0,
mediaTag),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -741,12 +741,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
}
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Converting_image_will_lose_sector_tag_0,
sectorTag),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -796,13 +796,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
_inputFormat.Info.SectorSize))
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_creating_output_image,
outputFormat.
ErrorMessage),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_creating_output_image, outputFormat.ErrorMessage);
@@ -843,13 +843,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
if(ForceChecked != true)
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_setting_metadata_not_continuing,
outputFormat.
ErrorMessage),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_setting_metadata_not_continuing, outputFormat.ErrorMessage);
@@ -875,13 +875,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
if(!outputOptical.SetTracks(tracks))
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_sending_tracks_list_to_output_image,
outputFormat.
ErrorMessage),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_sending_tracks_list_to_output_image, outputFormat.ErrorMessage);
@@ -925,11 +925,11 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
await Dispatcher.UIThread.InvokeAsync(action: async () =>
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_writing_media_tag_not_continuing,
outputFormat.ErrorMessage),
icon: Icon.Error).ShowDialog(_view));
icon: Icon.Error).ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_writing_media_tag_not_continuing, outputFormat.ErrorMessage);
}
@@ -937,11 +937,11 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
await Dispatcher.UIThread.InvokeAsync(action: async () =>
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_media_tag_not_continuing,
errno), icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag_not_continuing, errno);
}
@@ -1031,11 +1031,11 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_sector_1_not_continuing,
errno, doneSectors),
icon: Icon.Error).ShowDialog(_view));
icon: Icon.Error).ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
@@ -1064,11 +1064,11 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_sector_1_not_continuing,
errno, doneSectors),
icon: Icon.Error).ShowDialog(_view));
icon: Icon.Error).ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
@@ -1088,12 +1088,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.ErrorMessage,
doneSectors),
icon: Icon.Error).ShowDialog(_view));
icon: Icon.Error).ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.ErrorMessage, doneSectors);
@@ -1250,12 +1250,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_sector_1_not_continuing,
errno, doneSectors),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing, errno,
doneSectors);
@@ -1303,12 +1303,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_sector_1_not_continuing,
errno, doneSectors),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing, errno,
doneSectors);
@@ -1329,13 +1329,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.
ErrorMessage,
doneSectors),
icon: Icon.Error).ShowDialog(_view));
icon: Icon.Error).ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.ErrorMessage, doneSectors);
@@ -1440,12 +1440,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_sector_1_not_continuing,
errno, doneSectors),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -1475,12 +1475,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_sector_1_not_continuing,
errno, doneSectors),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -1498,13 +1498,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.
ErrorMessage,
doneSectors),
icon: Icon.Error).ShowDialog(_view));
icon: Icon.Error).ShowWindowDialogAsync(_view));
return;
}
@@ -1578,12 +1578,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
await Dispatcher.UIThread.InvokeAsync(action: async () =>
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_media_tag_not_continuing,
errno),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -1603,13 +1603,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
await Dispatcher.UIThread.InvokeAsync(action: async () =>
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_writing_tag_not_continuing,
outputFormat.
ErrorMessage),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -1666,12 +1666,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_reading_tag_for_sector_1_not_continuing,
errno, doneSectors),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -1688,14 +1688,14 @@ public sealed class ImageConvertViewModel : ViewModelBase
else
{
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_writing_tag_for_sector_1_not_continuing,
outputFormat.
ErrorMessage,
doneSectors),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -1757,8 +1757,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
await Dispatcher.UIThread.InvokeAsync(async () =>
{
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error, UI.Operation_canceled_the_output_file_is_not_correct,
icon: Icon.Error).ShowDialog(_view);
GetMessageBoxStandard(UI.Title_Error, UI.Operation_canceled_the_output_file_is_not_correct,
icon: Icon.Error).ShowWindowDialogAsync(_view);
CloseVisible = true;
StopVisible = false;
@@ -1771,13 +1771,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
if(!outputFormat.Close())
{
await Dispatcher.UIThread.InvokeAsync(async () => await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
GetMessageBoxStandard(UI.Title_Error,
string.
Format(UI.Error_0_closing_output_image_Contents_are_not_correct,
outputFormat.
ErrorMessage),
icon: Icon.Error).
ShowDialog(_view));
ShowWindowDialogAsync(_view));
return;
}
@@ -1785,10 +1785,10 @@ public sealed class ImageConvertViewModel : ViewModelBase
await Dispatcher.UIThread.InvokeAsync(async () =>
{
await MessageBoxManager.
GetMessageBoxStandardWindow(warning ? UI.Title_Warning : UI.Title_Conversion_success,
GetMessageBoxStandard(warning ? UI.Title_Warning : UI.Title_Conversion_success,
warning ? UI.Some_warnings_happened_Check_console
: UI.Image_converted_successfully,
icon: warning ? Icon.Warning : Icon.Info).ShowDialog(_view);
icon: warning ? Icon.Warning : Icon.Info).ShowWindowDialogAsync(_view);
CloseVisible = true;
StopVisible = false;
@@ -2044,8 +2044,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
}
catch
{
await MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, UI.Incorrect_metadata_sidecar_file,
icon: Icon.Error).ShowDialog(_view);
await MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, UI.Incorrect_metadata_sidecar_file,
icon: Icon.Error).ShowWindowDialogAsync(_view);
}
}
@@ -2097,15 +2097,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
}
else
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error,
UI.Resume_file_does_not_contain_dump_hardware_information,
icon: Icon.Error).ShowDialog(_view);
GetMessageBoxStandard(UI.Title_Error, UI.Resume_file_does_not_contain_dump_hardware_information,
icon: Icon.Error).ShowWindowDialogAsync(_view);
}
catch
{
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error, UI.Incorrect_resume_file, icon: Icon.Error).
ShowDialog(_view);
await MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, UI.Incorrect_resume_file, icon: Icon.Error).
ShowWindowDialogAsync(_view);
}
}
}

18
Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
View File

@@ -60,8 +60,8 @@ using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Media.Imaging;
using Avalonia.Platform;
using JetBrains.Annotations;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using ReactiveUI;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
using ImageInfo = Aaru.Gui.Views.Panels.ImageInfo;
@@ -480,8 +480,8 @@ public sealed class MainWindowViewModel : ViewModelBase
!ctx.Partitions.Any() &&
!ctx.SeenDevices.Any())
{
MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Warning, UI.There_are_no_statistics).
ShowDialog(_view);
MessageBoxManager.GetMessageBoxStandard(UI.Title_Warning, UI.There_are_no_statistics).
ShowWindowDialogAsync(_view);
return;
}
@@ -531,7 +531,7 @@ public sealed class MainWindowViewModel : ViewModelBase
if(inputFilter == null)
{
MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, UI.Cannot_open_specified_file, ButtonEnum.Ok,
MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, UI.Cannot_open_specified_file, ButtonEnum.Ok,
Icon.Error);
return;
@@ -541,7 +541,7 @@ public sealed class MainWindowViewModel : ViewModelBase
{
if(ImageFormat.Detect(inputFilter) is not IMediaImage imageFormat)
{
MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, UI.Image_format_not_identified,
MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, UI.Image_format_not_identified,
ButtonEnum.Ok, Icon.Error);
return;
@@ -555,7 +555,7 @@ public sealed class MainWindowViewModel : ViewModelBase
if(opened != ErrorNumber.NoError)
{
MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error,
MessageBoxManager.GetMessageBoxStandard(UI.Title_Error,
string.Format(UI.Error_0_opening_image_format,
opened), ButtonEnum.Ok, Icon.Error);
@@ -763,7 +763,7 @@ public sealed class MainWindowViewModel : ViewModelBase
}
catch(Exception ex)
{
MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, UI.Unable_to_open_image_format,
MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, UI.Unable_to_open_image_format,
ButtonEnum.Ok, Icon.Error);
AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
@@ -773,7 +773,7 @@ public sealed class MainWindowViewModel : ViewModelBase
}
catch(Exception ex)
{
MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, UI.Exception_reading_file, ButtonEnum.Ok,
MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, UI.Exception_reading_file, ButtonEnum.Ok,
Icon.Error);
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));

20
Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
View File

@@ -57,8 +57,8 @@ using Avalonia.Controls;
using Avalonia.Threading;
using DynamicData;
using JetBrains.Annotations;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using ReactiveUI;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
using Dump = Aaru.Core.Devices.Dumping.Dump;
@@ -546,8 +546,8 @@ public sealed class MediaDumpViewModel : ViewModelBase
_ = MessageBoxManager.
// ReSharper restore AssignmentIsFullyDiscarded
GetMessageBoxStandardWindow(UI.Title_Error, UI.Incorrect_metadata_sidecar_file, ButtonEnum.Ok,
Icon.Error).ShowDialog(_view).Result;
GetMessageBoxStandard(UI.Title_Error, UI.Incorrect_metadata_sidecar_file, ButtonEnum.Ok,
Icon.Error).ShowWindowDialogAsync(_view).Result;
ExistingMetadata = false;
}
@@ -736,8 +736,8 @@ public sealed class MediaDumpViewModel : ViewModelBase
catch
{
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error, UI.Incorrect_resume_file_cannot_use_it, ButtonEnum.Ok,
Icon.Error).ShowDialog(_view);
GetMessageBoxStandard(UI.Title_Error, UI.Incorrect_resume_file_cannot_use_it, ButtonEnum.Ok,
Icon.Error).ShowWindowDialogAsync(_view);
Resume = false;
@@ -750,9 +750,9 @@ public sealed class MediaDumpViewModel : ViewModelBase
return;
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Warning,
GetMessageBoxStandard(UI.Title_Warning,
UI.Media_already_dumped_correctly_please_choose_another_destination,
ButtonEnum.Ok, Icon.Warning).ShowDialog(_view);
ButtonEnum.Ok, Icon.Warning).ShowWindowDialogAsync(_view);
Resume = false;
}
@@ -956,8 +956,8 @@ public sealed class MediaDumpViewModel : ViewModelBase
{
ErrorMessage(text);
await MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, $"{text}", ButtonEnum.Ok, Icon.Error).
ShowDialog(_view);
await MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, $"{text}", ButtonEnum.Ok, Icon.Error).
ShowWindowDialogAsync(_view);
await WorkFinished();
});

17
Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs
View File

@@ -43,8 +43,9 @@ using Aaru.Localization;
using Avalonia.Controls;
using Avalonia.Media;
using Avalonia.Threading;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
//using OxyPlot;
using ReactiveUI;
@@ -345,8 +346,8 @@ public sealed class MediaScanViewModel : ViewModelBase
{
case null:
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error, string.Format(UI.Error_0_opening_device, devErrno),
ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
GetMessageBoxStandard(UI.Title_Error, string.Format(UI.Error_0_opening_device, devErrno),
ButtonEnum.Ok, Icon.Error).ShowWindowDialogAsync(_view);
StopVisible = false;
StartVisible = true;
@@ -365,8 +366,8 @@ public sealed class MediaScanViewModel : ViewModelBase
if(dev.Error)
{
await MessageBoxManager.
GetMessageBoxStandardWindow(UI.Title_Error, string.Format(UI.Error_0_opening_device, dev.LastError),
ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
GetMessageBoxStandard(UI.Title_Error, string.Format(UI.Error_0_opening_device, dev.LastError),
ButtonEnum.Ok, Icon.Error).ShowWindowDialogAsync(_view);
StopVisible = false;
StartVisible = true;
@@ -595,8 +596,8 @@ public sealed class MediaScanViewModel : ViewModelBase
{
ProgressText = text;
await MessageBoxManager.GetMessageBoxStandardWindow(UI.Title_Error, $"{text}", ButtonEnum.Ok, Icon.Error).
ShowDialog(_view);
await MessageBoxManager.GetMessageBoxStandard(UI.Title_Error, $"{text}", ButtonEnum.Ok, Icon.Error).
ShowWindowDialogAsync(_view);
await WorkFinished();
});