diff --git a/RomRepoMgr/RomRepoMgr.csproj b/RomRepoMgr/RomRepoMgr.csproj index fecfebf..fecc769 100644 --- a/RomRepoMgr/RomRepoMgr.csproj +++ b/RomRepoMgr/RomRepoMgr.csproj @@ -26,7 +26,7 @@ - + diff --git a/RomRepoMgr/ViewModels/AboutViewModel.cs b/RomRepoMgr/ViewModels/AboutViewModel.cs index 4a0bade..9fa6455 100644 --- a/RomRepoMgr/ViewModels/AboutViewModel.cs +++ b/RomRepoMgr/ViewModels/AboutViewModel.cs @@ -143,7 +143,7 @@ public sealed class AboutViewModel : ViewModelBase { /* var dialog = new LicenseDialog(); dialog.DataContext = new LicenseViewModel(dialog); - dialog.ShowDialog(_view);*/ + dialog.ShowWindowDialogAsync(_view);*/ } void ExecuteCloseCommand() => _view.Close(); diff --git a/RomRepoMgr/ViewModels/MainWindowViewModel.cs b/RomRepoMgr/ViewModels/MainWindowViewModel.cs index f8a5cad..7364b82 100644 --- a/RomRepoMgr/ViewModels/MainWindowViewModel.cs +++ b/RomRepoMgr/ViewModels/MainWindowViewModel.cs @@ -33,8 +33,8 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Threading; -using MessageBox.Avalonia; -using MessageBox.Avalonia.Enums; +using MsBox.Avalonia; +using MsBox.Avalonia.Enums; using ReactiveUI; using RomRepoMgr.Core.EventArgs; using RomRepoMgr.Core.Filesystem; @@ -233,12 +233,12 @@ public class MainWindowViewModel : ViewModelBase if(SelectedRomSet == null) return; ButtonResult result = await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.DeleteRomSetMsgBoxTitle, - string.Format(Localization.DeleteRomSetMsgBoxCaption, - SelectedRomSet.Name), - ButtonEnum.YesNo, - Icon.Database) - .ShowDialog(_view); + .GetMessageBoxStandard(Localization.DeleteRomSetMsgBoxTitle, + string.Format(Localization.DeleteRomSetMsgBoxCaption, + SelectedRomSet.Name), + ButtonEnum.YesNo, + Icon.Database) + .ShowWindowDialogAsync(_view); if(result == ButtonResult.No) return; @@ -343,11 +343,11 @@ public class MainWindowViewModel : ViewModelBase async void ExecuteUpdateStatsCommand() { ButtonResult result = await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.DatabaseMenuUpdateStatsText, - Localization.UpdateStatsConfirmationDialogText, - ButtonEnum.YesNo, - Icon.Database) - .ShowDialog(_view); + .GetMessageBoxStandard(Localization.DatabaseMenuUpdateStatsText, + Localization.UpdateStatsConfirmationDialogText, + ButtonEnum.YesNo, + Icon.Database) + .ShowWindowDialogAsync(_view); if(result == ButtonResult.No) return; diff --git a/RomRepoMgr/ViewModels/SettingsViewModel.cs b/RomRepoMgr/ViewModels/SettingsViewModel.cs index a595f8d..540f922 100644 --- a/RomRepoMgr/ViewModels/SettingsViewModel.cs +++ b/RomRepoMgr/ViewModels/SettingsViewModel.cs @@ -29,9 +29,9 @@ using System.Reactive; using System.Threading.Tasks; using Avalonia.Controls; using Avalonia.Threading; -using MessageBox.Avalonia; -using MessageBox.Avalonia.Enums; using Microsoft.EntityFrameworkCore; +using MsBox.Avalonia; +using MsBox.Avalonia.Enums; using ReactiveUI; using RomRepoMgr.Core.EventArgs; using RomRepoMgr.Core.Workers; @@ -154,9 +154,8 @@ public sealed class SettingsViewModel : ViewModelBase UnArVersion = ""; UnArPath = ""; - await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.Error, $"{args.Message}", ButtonEnum.Ok, Icon.Error) - .ShowDialog(_view); + await MessageBoxManager.GetMessageBoxStandard(Localization.Error, $"{args.Message}", ButtonEnum.Ok, Icon.Error) + .ShowWindowDialogAsync(_view); } void CheckUnArFinished(object sender, MessageEventArgs args) => Dispatcher.UIThread.Post(() => @@ -230,11 +229,11 @@ public sealed class SettingsViewModel : ViewModelBase if(File.Exists(result)) { ButtonResult btnResult = await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.DatabaseFileExistsMsgBoxTitle, - Localization.DatabaseFileTryOpenCaption, - ButtonEnum.YesNo, - Icon.Database) - .ShowDialog(_view); + .GetMessageBoxStandard(Localization.DatabaseFileExistsMsgBoxTitle, + Localization.DatabaseFileTryOpenCaption, + ButtonEnum.YesNo, + Icon.Database) + .ShowWindowDialogAsync(_view); if(btnResult == ButtonResult.Yes) { @@ -246,11 +245,11 @@ public sealed class SettingsViewModel : ViewModelBase catch(Exception) { btnResult = await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.DatabaseFileUnusableMsgBoxTitle, - Localization.DatabaseFileUnusableDeleteMsgBoxCaption, - ButtonEnum.YesNo, - Icon.Error) - .ShowDialog(_view); + .GetMessageBoxStandard(Localization.DatabaseFileUnusableMsgBoxTitle, + Localization.DatabaseFileUnusableDeleteMsgBoxCaption, + ButtonEnum.YesNo, + Icon.Error) + .ShowWindowDialogAsync(_view); if(btnResult == ButtonResult.No) return; @@ -261,11 +260,11 @@ public sealed class SettingsViewModel : ViewModelBase catch(Exception) { await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.DatabaseFileCannotDeleteTitle, - Localization.DatabaseFileCannotDeleteCaption, - ButtonEnum.Ok, - Icon.Error) - .ShowDialog(_view); + .GetMessageBoxStandard(Localization.DatabaseFileCannotDeleteTitle, + Localization.DatabaseFileCannotDeleteCaption, + ButtonEnum.Ok, + Icon.Error) + .ShowWindowDialogAsync(_view); return; } @@ -274,11 +273,11 @@ public sealed class SettingsViewModel : ViewModelBase else { btnResult = await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.DatabaseFileExistsMsgBoxTitle, - Localization.DatabaseFileDeleteCaption, - ButtonEnum.YesNo, - Icon.Error) - .ShowDialog(_view); + .GetMessageBoxStandard(Localization.DatabaseFileExistsMsgBoxTitle, + Localization.DatabaseFileDeleteCaption, + ButtonEnum.YesNo, + Icon.Error) + .ShowWindowDialogAsync(_view); if(btnResult == ButtonResult.No) return; @@ -289,11 +288,11 @@ public sealed class SettingsViewModel : ViewModelBase catch(Exception) { await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.DatabaseFileCannotDeleteTitle, - Localization.DatabaseFileCannotDeleteCaption, - ButtonEnum.Ok, - Icon.Error) - .ShowDialog(_view); + .GetMessageBoxStandard(Localization.DatabaseFileCannotDeleteTitle, + Localization.DatabaseFileCannotDeleteCaption, + ButtonEnum.Ok, + Icon.Error) + .ShowWindowDialogAsync(_view); return; } @@ -308,11 +307,11 @@ public sealed class SettingsViewModel : ViewModelBase catch(Exception) { await MessageBoxManager - .GetMessageBoxStandardWindow(Localization.DatabaseFileUnusableMsgBoxTitle, - Localization.DatabaseFileUnusableMsgBoxCaption, - ButtonEnum.Ok, - Icon.Error) - .ShowDialog(_view); + .GetMessageBoxStandard(Localization.DatabaseFileUnusableMsgBoxTitle, + Localization.DatabaseFileUnusableMsgBoxCaption, + ButtonEnum.Ok, + Icon.Error) + .ShowWindowDialogAsync(_view); return; }