Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

made some refactors

Browse Source
This commit is contained in:
Khamûl
2020-05-12 18:33:59 -04:00
parent d588619ed5
commit cd442adc29
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Wabbajack/View Models/Gallery/ModListGalleryVM.cs
View File

@ -24,8 +24,6 @@ namespace Wabbajack
public ObservableCollectionExtended<ModListMetadataVM> ModLists { get; } = new ObservableCollectionExtended<ModListMetadataVM>(); public ObservableCollectionExtended<ModListMetadataVM> ModLists { get; } = new ObservableCollectionExtended<ModListMetadataVM>();
private FiltersSettings settings;
private int missingHashFallbackCounter; private int missingHashFallbackCounter;
private const string ALL_GAME_TYPE = "All"; private const string ALL_GAME_TYPE = "All";
@ -48,6 +46,9 @@ namespace Wabbajack
public List<string> GameTypeEntries { get { return GetGameTypeEntries(); } } public List<string> GameTypeEntries { get { return GetGameTypeEntries(); } }
private readonly ObservableAsPropertyHelper<bool> _Loaded; private readonly ObservableAsPropertyHelper<bool> _Loaded;
private FiltersSettings settings => MWVM.Settings.Filters;
public bool Loaded => _Loaded.Value; public bool Loaded => _Loaded.Value;
public ICommand ClearFiltersCommand { get; } public ICommand ClearFiltersCommand { get; }
@ -58,21 +59,21 @@ namespace Wabbajack
MWVM = mainWindowVM; MWVM = mainWindowVM;
// load persistent filter settings // load persistent filter settings
settings = MWVM.Settings.Filters;
if (settings.IsPersistent) if (settings.IsPersistent)
{ {
GameType = !string.IsNullOrEmpty(settings.Game) ? settings.Game : ALL_GAME_TYPE; GameType = !string.IsNullOrEmpty(settings.Game) ? settings.Game : ALL_GAME_TYPE;
ShowNSFW = settings.ShowNSFW; ShowNSFW = settings.ShowNSFW;
OnlyInstalled = settings.OnlyInstalled; OnlyInstalled = settings.OnlyInstalled;
Search = settings.Search; Search = settings.Search;
// subscribe to save signal
MWVM.Settings.SaveSignal
.Subscribe(_ => UpdateFiltersSettings())
.DisposeWith(this.CompositeDisposable);
} }
else else
GameType = ALL_GAME_TYPE; GameType = ALL_GAME_TYPE;
// subscribe to save signal
MWVM.Settings.SaveSignal
.Subscribe(_ => UpdateFiltersSettings())
.DisposeWith(this.CompositeDisposable);
ClearFiltersCommand = ReactiveCommand.Create( ClearFiltersCommand = ReactiveCommand.Create(
() => () =>
{ {
@ -202,12 +203,8 @@ namespace Wabbajack
private void UpdateFiltersSettings() private void UpdateFiltersSettings()
{ {
if (!settings.IsPersistent) settings.Game = GameType;
return; settings.Search = Search;
if (!string.IsNullOrEmpty(GameType))
settings.Game = GameType;
if (Search != null)
settings.Search = Search;
settings.ShowNSFW = ShowNSFW; settings.ShowNSFW = ShowNSFW;
settings.OnlyInstalled = OnlyInstalled; settings.OnlyInstalled = OnlyInstalled;
} }