Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions Knossos.NET/Classes/ModTags.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ public void AddFilter(string filter)
Filters.Add(filter);
}

public void RemoveFilter(string filter)
{
Filters.Remove(filter);
}

/// <summary>
/// Check if a filter exist in this modid filterlist
/// Case insensitive
Expand Down Expand Up @@ -95,6 +100,7 @@ public static class ModTags
/// </summary>
public enum Filters
{
Hidden,
Total_Conversion,
Retail_FS2,
FS2_MOD,
Expand Down Expand Up @@ -199,6 +205,26 @@ public static void AddModFilter(string id, string filter)
}
}

/// <summary>
/// Removes a mod filter
/// </summary>
/// <param name="id"></param>
/// <param name="filter"></param>
public static void RemoveModFilter(string id, string filter)
{
for (int i = 0; i < modTags.Count(); i++)
{
if (modTags[i].ModID == id)
{
if (modTags[i].FilterExist(filter))
{
modTags[i].RemoveFilter(filter);
break;
}
}
}
}

/// <summary>
/// Adds a mod tag to the list
/// If the id and tag dosent exist already
Expand Down
14 changes: 13 additions & 1 deletion Knossos.NET/Models/GlobalSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
using Knossos.NET.ViewModels;
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Linq;
using Knossos.NET.Views;

namespace Knossos.NET.Models
{
Expand Down Expand Up @@ -121,6 +123,8 @@ public AutoUpdateFsoBuilds(bool stable = false, bool rc = false, bool nightly =
public AutoUpdateFsoBuilds autoUpdateBuilds { get; set; } = new AutoUpdateFsoBuilds();
[JsonPropertyName("warn_new_settings_system")]
public bool warnNewSettingsSystem { get; set; } = true;
[JsonPropertyName("hidden_mod_ids")]
public List<string> hiddenModIds { get; set; } = new List<string>();
[JsonIgnore]
private bool _closeToTray { get; set; } = false;
[JsonPropertyName("close_to_tray")]
Expand Down Expand Up @@ -686,7 +690,15 @@ public void Load()
portableFsoPreferences = tempSettings.portableFsoPreferences;
closeToTray = tempSettings.closeToTray;
ignoredLauncherUpdates = tempSettings.ignoredLauncherUpdates;

hiddenModIds = tempSettings.hiddenModIds;
if (hiddenModIds.Any())
{
foreach (var hiddenMod in hiddenModIds)
{
ModTags.AddModFilter(hiddenMod, "Hidden");
}
MainWindowViewModel.Instance?.InstalledModsView?.ResetFilters();
}
ReadFS2IniValues();
Log.Add(Log.LogSeverity.Information, "GlobalSettings.Load()", "Global settings have been loaded");

Expand Down
37 changes: 32 additions & 5 deletions Knossos.NET/ViewModels/ModListViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,32 @@ private void ApplyFilters()
}
}
//Filters
if (visibility && MainWindowViewModel.Instance != null && MainWindowViewModel.Instance.tagFilter.Any())
if (ModTags.IsFilterPresentInModID(card.ID, "Hidden"))
{
visibility = false;
foreach (var filter in MainWindowViewModel.Instance.tagFilter)
if (MainWindowViewModel.Instance != null && MainWindowViewModel.Instance.tagFilter.FirstOrDefault(f => f == "Hidden") != null)
{
if (card.ID != null && ModTags.IsFilterPresentInModID(card.ID, filter))
visibility = true;
}
}
else
{
if (MainWindowViewModel.Instance != null && MainWindowViewModel.Instance.tagFilter.Any())
{
visibility = false;
foreach (var filter in MainWindowViewModel.Instance.tagFilter)
{
visibility = true;
break;
if(filter == "Hidden")
{
if(MainWindowViewModel.Instance.tagFilter.Count == 1)
visibility = true;
continue;
}
if (card.ID != null && ModTags.IsFilterPresentInModID(card.ID, filter))
{
visibility = true;
break;
}
}
}
}
Expand Down Expand Up @@ -203,6 +220,16 @@ public void OpenTab()
BuildFilterString();
}

/// <summary>
/// Reset currently selected filters
/// </summary>
public void ResetFilters()
{
ModListView.Instance?.GenerateFilterButtons();
MainWindowViewModel.Instance?.tagFilter.Clear();
ApplyFilters();
}

public void CloseTab()
{
if (MainWindowViewModel.Instance != null)
Expand Down
21 changes: 21 additions & 0 deletions Knossos.NET/ViewModels/Windows/ModSettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public partial class ModSettingsViewModel : ViewModelBase
internal bool noIngameOptions = false;
[ObservableProperty]
internal bool ingameOptionsFileExist = false;
[ObservableProperty]
internal bool userHidden = false;

public ModSettingsViewModel()
{
Expand Down Expand Up @@ -95,6 +97,8 @@ public ModSettingsViewModel(Mod modJson, ModCardViewModel? modCard=null)
compressed = modJson.modSettings.isCompressed;
ignoreGlobalCmd = modJson.modSettings.ignoreGlobalCmd;
noIngameOptions = modJson.modSettings.noIngameOptions;
if (ModTags.IsFilterPresentInModID(modJson.id, "Hidden"))
UserHidden = true;
if (Knossos.globalSettings.modCompression != CompressionSettings.Disabled && !modJson.modSettings.isCompressed)
{
compressionAvailable = true;
Expand Down Expand Up @@ -346,7 +350,24 @@ internal void SaveSettingsCommand()

modJson.modSettings.ignoreGlobalCmd = IgnoreGlobalCmd;
modJson.modSettings.noIngameOptions = NoIngameOptions;
var oldUserHidden = ModTags.IsFilterPresentInModID(modJson.id, "Hidden");

if (UserHidden)
{
ModTags.AddModFilter(modJson.id, "Hidden");
if(!Knossos.globalSettings.hiddenModIds.Contains(modJson.id))
Knossos.globalSettings.hiddenModIds.Add(modJson.id);
}
else
{
ModTags.RemoveModFilter(modJson.id, "Hidden");
Knossos.globalSettings.hiddenModIds.Remove(modJson.id);
}
if (oldUserHidden != UserHidden)
{
MainWindowViewModel.Instance?.InstalledModsView?.ResetFilters();
Knossos.globalSettings.Save();
}
modJson.modSettings.Save();
if(modCardViewModel != null)
{
Expand Down
5 changes: 5 additions & 0 deletions Knossos.NET/Views/Windows/ModSettingsView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
<Label Foreground="White">Available exec type options: </Label>
<Label Foreground="Orange">Default, Release, Debug, Fred2, Fred2Debug, QtFred, QtFredDebug</Label>
</WrapPanel>
<!--Visibility Settings-->
<Label Margin="0,20,0,0" FontWeight="Black" FontSize="20">VISIBILITY SETTINGS</Label>
<CheckBox IsChecked="{Binding UserHidden}" Margin="5" ToolTip.Tip="Hide mod from your play menu. Can be displayed again by using the filter option to show hidden mods.">
Hidden by default
</CheckBox>
<!--Mod Engine Settings-->
<Label Margin="0,20,0,0" FontWeight="Black" FontSize="20">ENGINE SETTINGS</Label>
<CheckBox IsChecked="{Binding NoIngameOptions}" Margin="5" ToolTip.Tip="By disabling in-game options, launcher engine settings will be used instead. Only valid if the mod uses a FSO engine build equal or higher than version 24.2.0">
Expand Down