Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Settings V2] Updated general settings tests (#2971)

Browse Source 
* updated general settings tests

* reverted changes to solution files

* fetch test strings from a string resource

* updated bidning variable name to avoid confusion

Co-authored-by: Lavius Motileng <laviusmotileng-ms>
This commit is contained in:
Lavius Motileng
2020-05-15 09:38:47 -07:00
committed by GitHub
parent 4734cb3428
commit 8b0a995f23
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
View File

@@ -27,7 +27,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public ButtonClickCommand RestartElevatedButtonEventHandler { get; set; }
private ResourceLoader loader = ResourceLoader.GetForCurrentView();
private ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
public readonly string RunningAsUserDefaultText;
public readonly string RunningAsAdminDefaultText;
public GeneralViewModel()
{
@@ -97,6 +100,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_autoDownloadUpdates = GeneralSettingsConfigs.AutoDownloadUpdates;
_isElevated = ShellPage.IsElevated;
_runElevated = GeneralSettingsConfigs.RunElevated;
RunningAsUserDefaultText = loader.GetString("GeneralSettings_RunningAsUserText");
RunningAsAdminDefaultText = loader.GetString("GeneralSettings_RunningAsAdminText");
_isAdmin = ShellPage.IsUserAnAdmin;
}
@@ -147,17 +154,17 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
}
}
public string RunningAsAdminText
public string RunningAsText
{
get
{
if (!IsElevated)
{
return loader.GetString("GeneralSettings_Running as Adminstrator_IsNotElevated");
return RunningAsUserDefaultText;
}
else
{
return loader.GetString("GeneralSettings_RunningAsAdminText_IsElevated");
return RunningAsAdminDefaultText;
}
}
@@ -182,7 +189,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_isElevated = value;
OnPropertyChanged("IsElevated");
OnPropertyChanged("IsAdminButtonEnabled");
//OnPropertyChanged("AlwaysRunAsAdminText");
OnPropertyChanged("RunningAsAdminText");
}
}