Made some improvements to modpack import.

Artentus · Oct 12, 2018 · a811ca6 · a811ca6
1 parent 1bc1c81
commit a811ca6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ModMyFactory/ModMyFactory/Lang/Strings.de.xaml b/ModMyFactory/ModMyFactory/Lang/Strings.de.xaml
@@ -157,6 +157,8 @@
     <sys:String x:Key="UpdatingFactorioStage2Description">Update wird angewendet</sys:String>
 
     <sys:String x:Key="ExportingAction">Modpacks werden exportiert</sys:String>
+    <sys:String x:Key="ImportingAction">Modpacks werden importiert</sys:String>
+    <sys:String x:Key="ImportingDownloadingDescription">Mods werden heruntergeladen</sys:String>
 
 
 

diff --git a/ModMyFactory/ModMyFactory/Lang/Strings.en.xaml b/ModMyFactory/ModMyFactory/Lang/Strings.en.xaml
@@ -157,6 +157,8 @@
     <sys:String x:Key="UpdatingFactorioStage2Description">Applying update</sys:String>
 
     <sys:String x:Key="ExportingAction">Exporting modpacks</sys:String>
+    <sys:String x:Key="ImportingAction">Importing modpacks</sys:String>
+    <sys:String x:Key="ImportingDownloadingDescription">Downloading mods</sys:String>
 
 
 

diff --git a/ModMyFactory/ModMyFactory/ViewModels/MainViewModel_ModpackImport.cs b/ModMyFactory/ModMyFactory/ViewModels/MainViewModel_ModpackImport.cs
@@ -149,7 +149,7 @@ private async Task AddMod(ModExportTemplate modTemplate, DirectoryInfo fileLocat
             {
                 if (ModFile.TryLoadFromFile(file, out var modFile, true))
                 {
-                    Mod mod = await Mod.Add(modFile, Mods, Modpacks, false);
+                    Mod mod = await Mod.Add(modFile, Mods, Modpacks, false, true);
                     modTemplate.Mod = mod;
                     return;
                 }
@@ -164,7 +164,7 @@ private async Task AddMod(ModExportTemplate modTemplate, DirectoryInfo fileLocat
             {
                 if (ModFile.TryLoadFromDirectory(directory, out var modFile, true))
                 {
-                    Mod mod = await Mod.Add(modFile, Mods, Modpacks, false);
+                    Mod mod = await Mod.Add(modFile, Mods, Modpacks, false, true);
                     modTemplate.Mod = mod;
                     return;
                 }
@@ -204,7 +204,8 @@ private async Task ImportModpackFileV2(ExportTemplate template, DirectoryInfo fi
         {
             var progressWindow = new ProgressWindow() { Owner = Window };
             var progressViewModel = (ProgressViewModel)progressWindow.ViewModel;
-            progressViewModel.ActionName = App.Instance.GetLocalizedResourceString("DownloadingAction");
+            progressViewModel.ActionName = App.Instance.GetLocalizedResourceString("ImportingAction");
+            progressViewModel.ProgressDescription = App.Instance.GetLocalizedResourceString("Downloading mods");
 
             var progress = new Progress<double>(p => progressViewModel.Progress = p);