Skip to content
Merged
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
24 changes: 15 additions & 9 deletions src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,18 @@ public DashboardViewModel(ISettingsRepository<GeneralSettings> settingsRepositor
private void AddDashboardListItem(ModuleType moduleType)
{
GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(moduleType);
AllModules.Add(new DashboardListItem()
var newItem = new DashboardListItem()
{
Tag = moduleType,
Label = resourceLoader.GetString(ModuleHelper.GetModuleLabelResourceName(moduleType)),
IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
EnabledChangedCallback = EnabledChangedOnUI,
DashboardModuleItems = GetModuleItems(moduleType),
});
};

AllModules.Add(newItem);
newItem.EnabledChangedCallback = EnabledChangedOnUI;
}

private void EnabledChangedOnUI(DashboardListItem dashboardListItem)
Expand Down Expand Up @@ -120,16 +122,18 @@ private void GetShortcutModules()

if (filteredItems.Count != 0)
{
ShortcutModules.Add(new DashboardListItem
var newItem = new DashboardListItem
{
EnabledChangedCallback = x.EnabledChangedCallback,
Icon = x.Icon,
IsLocked = x.IsLocked,
Label = x.Label,
Tag = x.Tag,
IsEnabled = x.IsEnabled,
DashboardModuleItems = new ObservableCollection<DashboardModuleItem>(filteredItems),
});
};

ShortcutModules.Add(newItem);
newItem.EnabledChangedCallback = x.EnabledChangedCallback;
}
}

Expand All @@ -141,16 +145,18 @@ private void GetShortcutModules()

if (filteredItems.Count != 0)
{
ActionModules.Add(new DashboardListItem
var newItem = new DashboardListItem
{
EnabledChangedCallback = x.EnabledChangedCallback,
Icon = x.Icon,
IsLocked = x.IsLocked,
Label = x.Label,
Tag = x.Tag,
IsEnabled = x.IsEnabled,
DashboardModuleItems = new ObservableCollection<DashboardModuleItem>(filteredItems),
});
};

ActionModules.Add(newItem);
newItem.EnabledChangedCallback = x.EnabledChangedCallback;
}
}
}
Expand Down