Merge #2744 Combine recommendation and suggestion screens

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 - [GUI] Relabel Yes/No buttons for some questions (#2737 by: HebaruSan; reviewed: DasSkelett)
 - [Netkan] Handle non-raw GitHub URLs for metanetkans and avc krefs (#2696 by: HebaruSan; reviewed: DasSkelett)
 - [GUI] Ignore spaces and special chars in mod search (#2709 by: DasSkelett; reviewed: HebaruSan)
+- [GUI] Combine recommendation and suggestion screens (#2744 by: HebaruSan; reviewed: DasSkelett)
 
 ## Bugfixes
 

GUI/MainInstall.cs

@@ -124,23 +124,17 @@ private void InstallMods(object sender, DoWorkEventArgs e)
                 }
             }
 
-            // Now work on satisifying dependencies.
-
-            var recommended = new Dictionary<CkanModule, List<string>>();
-            var suggested   = new Dictionary<CkanModule, List<string>>();
-
-            foreach (var change in opts.Key)
+            // Prompt for recommendations and suggestions, if any
+            var recRows = getRecSugRows(
+                opts.Key.Where(ch => ch.ChangeType == GUIModChangeType.Install)
+                    .Select(ch => ch.Mod.ToModule()),
+                registry, toInstall
+            );
+            if (recRows.Any())
             {
-                if (change.ChangeType == GUIModChangeType.Install)
-                {
-                    AddMod(change.Mod.ToModule().recommends, recommended, change.Mod.Identifier, registry, toInstall);
-                    AddMod(change.Mod.ToModule().suggests,   suggested,   change.Mod.Identifier, registry, toInstall);
-                }
+                ShowRecSugDialog(recRows, toInstall);
             }
 
-            ShowSelection(recommended, toInstall);
-            ShowSelection(suggested,   toInstall, true);
-
             tabController.HideTab("ChooseRecommendedModsTabPage");
 
             if (installCanceled)