Merge #4230 Set focus better on Ctrl+F

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## v1.35.3
 
+### Bugfixes
+
+- [GUI] Set focus better on Ctrl+F (#4230 by: HebaruSan)
+
 ### Internal
 
 - [Netkan] Tests for Newtonsoft.Json's handling of octal literals in version files (#4227 by: HebaruSan)

Cmdline/Action/Search.cs

@@ -70,8 +70,8 @@ public int RunCommand(CKAN.GameInstance ksp, object raw_options)
             }
 
             // Present the results.
-            if (!matching_compatible.Any()
-                && (!options.all || !matching_incompatible.Any()))
+            if (matching_compatible.Count == 0
+                && (!options.all || matching_incompatible.Count == 0))
             {
                 return Exit.OK;
             }
@@ -89,7 +89,7 @@ public int RunCommand(CKAN.GameInstance ksp, object raw_options)
                                       mod.@abstract);
                 }
 
-                if (matching_incompatible.Any())
+                if (matching_incompatible.Count != 0)
                 {
                     user.RaiseMessage(Properties.Resources.SearchIncompatibleModsHeader);
                     foreach (CkanModule mod in matching_incompatible)

Cmdline/Action/Show.cs

@@ -68,7 +68,7 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
                     var matches = search.PerformSearch(instance, modName);
 
                     // Display the results of the search.
-                    if (!matches.Any())
+                    if (matches.Count == 0)
                     {
                         // No matches found.
                         user.RaiseMessage(Properties.Resources.ShowNoClose);

Core/GameInstanceManager.cs

@@ -133,7 +133,7 @@ public GameInstanceManager(IUser user, IConfiguration? configuration = null)
             // If we know of no instances, try to find one.
             // Otherwise, we know of too many instances!
             // We don't know which one to pick, so we return null.
-            return !instances.Any() ? FindAndRegisterDefaultInstances() : null;
+            return instances.Count == 0 ? FindAndRegisterDefaultInstances() : null;
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ public GameInstanceManager(IUser user, IConfiguration? configuration = null)
         /// </summary>
         public GameInstance? FindAndRegisterDefaultInstances()
         {
-            if (instances.Any())
+            if (instances.Count != 0)
             {
                 throw new KSPManagerKraken("Attempted to scan for defaults with instances");
             }

Core/ModuleInstaller.cs

@@ -779,7 +779,7 @@ public void UninstallList(IEnumerable<string>  mods,
                 .ToList();
 
             // If there is nothing to uninstall, skip out.
-            if (!goners.Any())
+            if (goners.Count == 0)
             {
                 return;
             }

Core/Registry/Registry.cs

@@ -1164,7 +1164,7 @@ public static IEnumerable<string> FindReverseDependencies(
 
             // The empty list has no reverse dependencies
             // (Don't remove broken modules if we're only installing)
-            if (modulesToRemove.Any())
+            if (modulesToRemove.Count != 0)
             {
                 // All modules in the input are included in the output
                 foreach (string starter in modulesToRemove)

Core/Relationships/RelationshipResolver.cs

@@ -307,7 +307,7 @@ private void ResolveStanza(List<RelationshipDescriptor>?        stanza,
                                   && reason is SelectionReason.RelationshipReason rel
                                   && MightBeInstallable(mod, rel.Parent, installed_modules))
                     .ToList();
-                if (!candidates.Any())
+                if (candidates.Count == 0)
                 {
                     // Nothing found, try again while simulating an empty mod list
                     // Necessary for e.g. proceed_with_inconsistencies, conflicts will still be caught below
@@ -319,7 +319,7 @@ private void ResolveStanza(List<RelationshipDescriptor>?        stanza,
                         .ToList();
                 }
 
-                if (!candidates.Any())
+                if (candidates.Count == 0)
                 {
                     if (!soft_resolve && reason is SelectionReason.RelationshipReason rel)
                     {
@@ -645,7 +645,7 @@ public IEnumerable<string> ConflictDescriptions
                             conflictingModDescription(kvp.Key,   null),
                             conflictingModDescription(kvp.Value, null)));
 
-        public bool IsConsistent => !conflicts.Any();
+        public bool IsConsistent => conflicts.Count == 0;
 
         public List<SelectionReason> ReasonsFor(CkanModule mod)
             => reasons.TryGetValue(mod, out List<SelectionReason>? r)

Core/Relationships/SanityChecker.cs

@@ -54,7 +54,7 @@ private static bool CheckConsistency(IEnumerable<CkanModule>             modules
             var dllSet = dlls?.ToHashSet();
             UnmetDepends = FindUnsatisfiedDepends(modList, dllSet, dlc).ToList();
             Conflicts = FindConflicting(modList, dllSet, dlc);
-            return !UnmetDepends.Any() && !Conflicts.Any();
+            return UnmetDepends.Count == 0 && Conflicts.Count == 0;
         }
 
         /// <summary>

GUI/Controls/Changeset.cs

@@ -34,7 +34,7 @@ public void LoadChangeset(List<ModChange>                 changes,
                                   Dictionary<CkanModule, string>? conflicts)
         {
             changeset = changes;
-            ConfirmChangesButton.Enabled = conflicts == null || !conflicts.Any();
+            ConfirmChangesButton.Enabled = conflicts == null || conflicts.Count == 0;
             CloseTheGameLabel.Visible = changes?.Any(ch => DeletingChanges.Contains(ch.ChangeType))
                                         ?? false;
             ChangesGrid.DataSource = new BindingList<ChangesetRow>(

GUI/Controls/ChooseRecommendedMods.cs

@@ -157,7 +157,7 @@ private void MarkConflicts()
                             ? Color.LightCoral
                             : Color.Empty;
                     }
-                    RecommendedModsContinueButton.Enabled = !conflicts.Any();
+                    RecommendedModsContinueButton.Enabled = conflicts.Count == 0;
                     OnConflictFound?.Invoke(string.Join("; ", resolver.ConflictDescriptions));
                 }
                 catch (DependencyNotSatisfiedKraken k)

GUI/Controls/ManageMods.cs

@@ -19,7 +19,7 @@ namespace CKAN.GUI
     #if NET5_0_OR_GREATER
     [SupportedOSPlatform("windows")]
     #endif
-    public partial class ManageMods : UserControl
+    public partial class ManageMods : UserControl, ISearchableControl
     {
         public ManageMods()
         {
@@ -144,7 +144,7 @@ private void ChangeSetUpdated()
         {
             Util.Invoke(this, () =>
             {
-                if (ChangeSet != null && ChangeSet.Any())
+                if (ChangeSet != null && ChangeSet.Count != 0)
                 {
                     ApplyToolButton.Enabled = true;
                 }
@@ -1900,17 +1900,8 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
             switch (keyData)
             {
-                case Keys.Control | Keys.F:
-                    ActiveControl = EditModSearches;
-                    return true;
-
-                case Keys.Control | Keys.Shift | Keys.F:
-                    EditModSearches.ExpandCollapse();
-                    ActiveControl = EditModSearches;
-                    return true;
-
                 case Keys.Control | Keys.S:
-                    if (ChangeSet != null && ChangeSet.Any())
+                    if (ChangeSet != null && ChangeSet.Count != 0)
                     {
                         ApplyToolButton_Click(null, null);
                     }
@@ -1921,9 +1912,19 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
             return base.ProcessCmdKey(ref msg, keyData);
         }
 
+        public void FocusSearch(bool expandCollapse = false)
+        {
+            ActiveControl = EditModSearches;
+            EditModSearches.Focus();
+            if (expandCollapse)
+            {
+                EditModSearches.ExpandCollapse();
+            }
+        }
+
         public bool AllowClose()
         {
-            if (Conflicts != null && Conflicts.Any())
+            if (Conflicts != null && Conflicts.Count != 0)
             {
                 // Ask if they want to resolve conflicts
                 string confDescrip = Conflicts

GUI/Dialogs/ManageGameInstancesDialog.cs

@@ -41,7 +41,7 @@ public ManageGameInstancesDialog(GameInstanceManager mgr,
                 StartPosition = FormStartPosition.CenterScreen;
             }
 
-            if (!manager.Instances.Any())
+            if (manager.Instances.Count == 0)
             {
                 manager.FindAndRegisterDefaultInstances();
             }

GUI/ISearchableControl.cs

@@ -0,0 +1,7 @@
+namespace CKAN.GUI
+{
+    public interface ISearchableControl
+    {
+        void FocusSearch(bool expandCollapse = false);
+    }
+}

GUI/Main/Main.cs

@@ -611,6 +611,38 @@ protected override void OnMove(EventArgs e)
             ManageMods?.ParentMoved();
         }
 
+        private IEnumerable<T> VisibleControls<T>()
+            => (MainTabControl?.SelectedTab
+                              ?.Controls
+                               .OfType<T>()
+                              ?? Enumerable.Empty<T>())
+                  .Concat(!splitContainer1.Panel2Collapsed
+                          && ModInfo is T t
+                              ? Enumerable.Repeat(t, 1)
+                              : Enumerable.Empty<T>());
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            switch (e.KeyData)
+            {
+                case Keys.Control | Keys.F:
+                    VisibleControls<ISearchableControl>()
+                        .FirstOrDefault()
+                        ?.FocusSearch(false);
+                    e.Handled = true;
+                    break;
+                case Keys.Control | Keys.Shift | Keys.F:
+                    VisibleControls<ISearchableControl>()
+                        .FirstOrDefault()
+                        ?.FocusSearch(true);
+                    e.Handled = true;
+                    break;
+                default:
+                    base.OnKeyDown(e);
+                    break;
+            }
+        }
+
         private void SetupDefaultSearch()
         {
             if (CurrentInstance != null && configuration != null)
@@ -821,7 +853,7 @@ private void InstallFromCkanFiles(string[] files)
                                              .Select(gv => new GameVersion(gv.Major, gv.Minor))
                                              .Distinct()
                                              .ToList();
-                if (missing.Any()
+                if (missing.Count != 0
                     && YesNoDialog(string.Format(Properties.Resources.MetapackageAddCompatibilityPrompt,
                                                  filesRange.ToSummaryString(CurrentInstance.game),
                                                  crit.ToSummaryString(CurrentInstance.game)),
@@ -841,7 +873,7 @@ private void InstallFromCkanFiles(string[] files)
                 .ToHashSet();
             // Get incompatible mods we're installing
             var myIncompat = toInstall.Where(mod => allIncompat.Contains(mod.identifier)).ToList();
-            if (!myIncompat.Any()
+            if (myIncompat.Count == 0
                 // Confirm installation of incompatible like the Versions tab does
                 || YesNoDialog(string.Format(Properties.Resources.ModpackInstallIncompatiblePrompt,
                                              string.Join(Environment.NewLine, myIncompat),
@@ -943,7 +975,7 @@ private void ShowSelectionModInfo(ListView.SelectedListViewItemCollection select
 
         private void ManageMods_OnChangeSetChanged(List<ModChange> changeset, Dictionary<GUIMod, string> conflicts)
         {
-            if (changeset != null && changeset.Any())
+            if (changeset != null && changeset.Count != 0)
             {
                 tabController.ShowTab("ChangesetTabPage", 1, false);
                 UpdateChangesDialog(
@@ -1069,7 +1101,7 @@ private void LaunchGame(string? command = null)
                 var incomp = registry.IncompatibleInstalled(CurrentInstance.VersionCriteria())
                     .Where(m => !m.Module.IsDLC && !suppressedIdentifiers.Contains(m.identifier))
                     .ToList();
-                if (incomp.Any() && CurrentInstance.Version() is GameVersion gv)
+                if (incomp.Count != 0 && CurrentInstance.Version() is GameVersion gv)
                 {
                     // Warn that it might not be safe to run game with incompatible modules installed
                     string incompatDescrip = incomp

GUI/Main/MainRecommendations.cs

@@ -62,7 +62,7 @@ private void AuditRecommendations(Registry registry, GameVersionCriteria version
                         recommendations, suggestions, supporters);
                     var result = ChooseRecommendedMods.Wait();
                     tabController.HideTab("ChooseRecommendedModsTabPage");
-                    if (result != null && result.Any())
+                    if (result != null && result.Count != 0)
                     {
                         Wait.StartWaiting(InstallMods, PostInstallMods, true,
                             new InstallArgument(

Netkan/Processors/QueueHandler.cs

@@ -92,7 +92,7 @@ private void handleMessages(string url, int howMany, int timeoutMinutes)
                 VisibilityTimeout     = (int)TimeSpan.FromMinutes(timeoutMinutes).TotalSeconds,
                 MessageAttributeNames = new List<string>() { "All" },
             }).Result;
-            if (!resp.Messages.Any())
+            if (resp.Messages.Count == 0)
             {
                 log.Debug("No metadata in queue");
             }
@@ -261,7 +261,7 @@ private SendMessageBatchRequestEntry inflationMessage(Metadata?        ckan,
                     }
                 );
             }
-            if (warningAppender.Warnings.Any())
+            if (warningAppender.Warnings.Count != 0)
             {
                 attribs.Add(
                     "WarningMessages",

Netkan/Sources/Github/GithubApi.cs

@@ -82,7 +82,7 @@ public IEnumerable<GithubRelease> GetAllReleases(GithubRef reference)
                         ghRel.PreRelease == reference.UsePrerelease
                         // Skip releases without assets
                         && ghRel.Assets != null
-                        && ghRel.Assets.Any())
+                        && ghRel.Assets.Count != 0)
                     // Insurance against GitHub returning them in the wrong order
                     .OrderByDescending(ghRel => ghRel.PublishedAt)
                     .ToList();

Netkan/Transformers/NetkanTransformer.cs

@@ -107,7 +107,7 @@ private static List<ITransformer> InjectVersionedOverrideTransformers(List<ITran
                 result.Add(transformers[i]);
             }
 
-            if (result.Any())
+            if (result.Count != 0)
             {
                 if (result.First() is VersionedOverrideTransformer firstVersionedOverride)
                 {

Netkan/Validators/CraftsInShipsValidator.cs

@@ -35,7 +35,7 @@ public void Validate(Metadata metadata)
                         .Where(f => !AllowedCraftPath(inst.ToRelativeGameDir(f.destination)))
                         .ToList();
 
-                    if (badCrafts.Any())
+                    if (badCrafts.Count != 0)
                     {
                         Log.WarnFormat(
                             "Craft files installed outside Ships folder: {0}",

Netkan/Validators/HarmonyValidator.cs

@@ -41,7 +41,7 @@ public void Validate(Metadata metadata)
                                               StringComparison.InvariantCultureIgnoreCase) != -1)
                         .OrderBy(f => f)
                         .ToList();
-                    bool bundlesHarmony   = harmonyDLLs.Any();
+                    bool bundlesHarmony   = harmonyDLLs.Count != 0;
                     bool providesHarmony1 = mod.ProvidesList.Contains("Harmony1");
                     if (bundlesHarmony && !providesHarmony1)
                     {

Netkan/Validators/InstallsFilesValidator.cs

@@ -48,7 +48,7 @@ public void Validate(Metadata metadata)
                                     && p.LastIndexOf($"/{dir}/", StringComparison.InvariantCultureIgnoreCase) > 0)
                         .OrderBy(f => f)
                         .ToList();
-                    if (gamedatas.Any())
+                    if (gamedatas.Count != 0)
                     {
                         var badPaths = string.Join("\r\n", gamedatas);
                         throw new Kraken($"{dir} directory found within {dir}:\r\n{badPaths}");
@@ -60,7 +60,7 @@ public void Validate(Metadata metadata)
                     .GroupBy(f => f)
                     .SelectMany(grp => grp.Skip(1).OrderBy(f => f))
                     .ToList();
-                if (duplicates.Any())
+                if (duplicates.Count != 0)
                 {
                     var badPaths = string.Join("\r\n", duplicates);
                     throw new Kraken($"Multiple files attempted to install to:\r\n{badPaths}");
@@ -75,7 +75,7 @@ public void Validate(Metadata metadata)
                         .Distinct()
                         .Where(incl => !allFiles.Any(f => f.Contains(incl)))
                         .ToList();
-                    if (unmatchedIncludeOnlys.Any())
+                    if (unmatchedIncludeOnlys.Count != 0)
                     {
                         log.WarnFormat("No matches for includes_only: {0}",
                                        string.Join(", ", unmatchedIncludeOnlys));

Netkan/Validators/PluginsValidator.cs

@@ -33,7 +33,7 @@ public void Validate(Metadata metadata)
                     GameInstance inst = new GameInstance(_game, "/", "dummy", new NullUser());
 
                     var plugins    = _moduleService.GetPlugins(mod, zip, inst).ToList();
-                    bool hasPlugin = plugins.Any();
+                    bool hasPlugin = plugins.Count != 0;
                     if (hasPlugin)
                     {
                         var dllPaths = plugins
@@ -45,7 +45,7 @@ public void Validate(Metadata metadata)
                             .Where(ident => !string.IsNullOrEmpty(ident)
                                 && !identifiersToIgnore.Contains(ident))
                             .ToHashSet();
-                        if (dllIdentifiers.Any() && !dllIdentifiers.Contains(metadata.Identifier))
+                        if (dllIdentifiers.Count != 0 && !dllIdentifiers.Contains(metadata.Identifier))
                         {
                             Log.WarnFormat(
                                 "No plugin matching the identifier, manual installations won't be detected: {0}",

Netkan/Validators/SpaceWarpInfoValidator.cs

@@ -49,7 +49,7 @@ public void Validate(Metadata metadata)
                                               StringComparer.InvariantCultureIgnoreCase))
                                          ?? Enumerable.Empty<string>())
                                           .ToList();
-                if (missingDeps.Any())
+                if (missingDeps.Count != 0)
                 {
                     log.WarnFormat("Dependencies from swinfo.json missing from module: {0}",
                                    string.Join(", ", missingDeps));