From 06c9ff49a020fea7b5905616e9a4c87f577c996c Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 15 Oct 2019 20:21:55 +1100 Subject: [PATCH] Fix identation + display disabled program sources --- .../Views/Commands/ProgramSettingDisplay.cs | 65 ++++++++++++------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/Plugins/Wox.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs b/Plugins/Wox.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs index 93102698a7..b2785c5444 100644 --- a/Plugins/Wox.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs +++ b/Plugins/Wox.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs @@ -14,14 +14,29 @@ namespace Wox.Plugin.Program.Views.Commands var list = new List(); programSources.ForEach(x => list - .Add( - new ProgramSource { - Enabled = x.Enabled, - Location = x.Location, - Name = x.Name, - UniqueIdentifier = x.UniqueIdentifier - } - )); + .Add( + new ProgramSource + { + Enabled = x.Enabled, + Location = x.Location, + Name = x.Name, + UniqueIdentifier = x.UniqueIdentifier + } + )); + + // Even though these are disabled, we still want to display them so users can enable later on + Main._settings + .DisabledProgramSources + .ForEach(x => list + .Add( + new ProgramSource + { + Enabled = x.Enabled, + Location = x.Location, + Name = x.Name, + UniqueIdentifier = x.UniqueIdentifier + } + )); return list; } @@ -32,27 +47,29 @@ namespace Wox.Plugin.Program.Views.Commands .Where(t1 => !ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier)) .ToList() .ForEach(t1 => ProgramSetting.ProgramSettingDisplayList - .Add( - new ProgramSource { - Name = t1.Name, - Location = t1.ParentDirectory, - UniqueIdentifier = t1.UniqueIdentifier, - Enabled = t1.Enabled - } - )); + .Add( + new ProgramSource + { + Name = t1.Name, + Location = t1.ParentDirectory, + UniqueIdentifier = t1.UniqueIdentifier, + Enabled = t1.Enabled + } + )); Main._uwps .Where(t1 => !ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier)) .ToList() .ForEach(t1 => ProgramSetting.ProgramSettingDisplayList - .Add( - new ProgramSource { - Name = t1.DisplayName, - Location = t1.Package.Location, - UniqueIdentifier = t1.UniqueIdentifier, - Enabled = t1.Enabled - }) - ); + .Add( + new ProgramSource + { + Name = t1.DisplayName, + Location = t1.Package.Location, + UniqueIdentifier = t1.UniqueIdentifier, + Enabled = t1.Enabled + } + )); } internal static void SetProgramSourcesStatus(this List list, List selectedProgramSourcesToDisable, bool status)