diff --git a/RomRepoMgr.Core/Resources/Localization.Designer.cs b/RomRepoMgr.Core/Resources/Localization.Designer.cs index 47ddfb0..00ecd66 100644 --- a/RomRepoMgr.Core/Resources/Localization.Designer.cs +++ b/RomRepoMgr.Core/Resources/Localization.Designer.cs @@ -386,5 +386,11 @@ namespace RomRepoMgr.Core.Resources { return ResourceManager.GetString("NotAnAaruFormatFile", resourceCulture); } } + + internal static string DatImportSuccess { + get { + return ResourceManager.GetString("DatImportSuccess", resourceCulture); + } + } } } diff --git a/RomRepoMgr.Core/Resources/Localization.resx b/RomRepoMgr.Core/Resources/Localization.resx index 647d27d..3d06f17 100644 --- a/RomRepoMgr.Core/Resources/Localization.resx +++ b/RomRepoMgr.Core/Resources/Localization.resx @@ -187,4 +187,7 @@ Not an AaruFormat file. + + Imported {0} machines with {1} ROMs. + \ No newline at end of file diff --git a/RomRepoMgr.Core/Workers/DatImporter.cs b/RomRepoMgr.Core/Workers/DatImporter.cs index b2e7c5d..ae7f352 100644 --- a/RomRepoMgr.Core/Workers/DatImporter.cs +++ b/RomRepoMgr.Core/Workers/DatImporter.cs @@ -1118,7 +1118,10 @@ namespace RomRepoMgr.Core.Workers ctx.SaveChanges(); - WorkFinished?.Invoke(this, System.EventArgs.Empty); + WorkFinished?.Invoke(this, new MessageEventArgs + { + Message = string.Format(Localization.DatImportSuccess, stats.TotalMachines, stats.TotalRoms) + }); RomSetAdded?.Invoke(this, new RomSetEventArgs { @@ -1160,7 +1163,7 @@ namespace RomRepoMgr.Core.Workers public void Abort() => _aborted = true; public event EventHandler SetIndeterminateProgress; - public event EventHandler WorkFinished; + public event EventHandler WorkFinished; public event EventHandler ErrorOccurred; public event EventHandler SetProgressBounds; public event EventHandler SetProgress; diff --git a/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs b/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs index a7e12e6..012ed6f 100644 --- a/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs +++ b/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs @@ -305,12 +305,12 @@ namespace RomRepoMgr.ViewModels Task.Run(_worker.Import); } - void OnWorkerOnWorkFinished(object sender, EventArgs args) => Dispatcher.UIThread.Post(() => + void OnWorkerOnWorkFinished(object sender, MessageEventArgs args) => Dispatcher.UIThread.Post(() => { ImportResults.Add(new ImportDatFolderItem { Filename = Path.GetFileName(_datFiles[_listPosition]), - Status = Localization.OK + Status = args.Message }); _listPosition++; diff --git a/RomRepoMgr/ViewModels/ImportDatViewModel.cs b/RomRepoMgr/ViewModels/ImportDatViewModel.cs index b2ac930..a360dd6 100644 --- a/RomRepoMgr/ViewModels/ImportDatViewModel.cs +++ b/RomRepoMgr/ViewModels/ImportDatViewModel.cs @@ -126,9 +126,9 @@ namespace RomRepoMgr.ViewModels public string CloseLabel => Localization.CloseLabel; public ReactiveCommand CloseCommand { get; } - void OnWorkerOnWorkFinished(object sender, EventArgs args) => Dispatcher.UIThread.Post(() => + void OnWorkerOnWorkFinished(object sender, MessageEventArgs args) => Dispatcher.UIThread.Post(() => { - StatusMessage = Localization.Finished; + StatusMessage = args.Message; ProgressVisible = false; CanClose = true; });