Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate variables handling

Browse Source 
Fix user variable handling and preview
This commit is contained in:
Stefan Markovic
2023-10-04 16:44:30 +02:00
parent 6717fea41e
commit bb684d30a0
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Converters/VariableTypeToGlyphConverter.cs
View File

@@ -18,6 +18,8 @@ public class VariableTypeToGlyphConverter : IValueConverter
VariablesSetType.User => "\uE77B", VariablesSetType.User => "\uE77B",
VariablesSetType.System => "\uE977", VariablesSetType.System => "\uE977",
VariablesSetType.Profile => "\uEDE3", VariablesSetType.Profile => "\uEDE3",
VariablesSetType.Path => "\uE8AC",
VariablesSetType.Duplicate => "\uE8C8",
_ => throw new NotImplementedException(), _ => throw new NotImplementedException(),
}; };
} }

4
src/modules/EnvironmentVariables/EnvironmentVariables/Helpers/EnvironmentVariablesHelper.cs
View File

@@ -27,7 +27,7 @@ namespace EnvironmentVariables.Helpers
var key = variable.Key as string; var key = variable.Key as string;
if (key.Equals(variableName, StringComparison.OrdinalIgnoreCase)) if (key.Equals(variableName, StringComparison.OrdinalIgnoreCase))
{ {
return new Variable(variableName, userVariables[key] as string, VariablesSetType.User); return new Variable(key, userVariables[key] as string, VariablesSetType.User);
} }
} }
@@ -38,7 +38,7 @@ namespace EnvironmentVariables.Helpers
var key = variable.Key as string; var key = variable.Key as string;
if (key.Equals(variableName, StringComparison.OrdinalIgnoreCase)) if (key.Equals(variableName, StringComparison.OrdinalIgnoreCase))
{ {
return new Variable(variableName, userVariables[key] as string, VariablesSetType.System); return new Variable(key, systemVariables[key] as string, VariablesSetType.System);
} }
} }

2
src/modules/EnvironmentVariables/EnvironmentVariables/Models/ProfileVariablesSet.cs
View File

@@ -39,7 +39,7 @@ namespace EnvironmentVariables.Models
var variableToOverride = EnvironmentVariablesHelper.GetExisting(variable.Name); var variableToOverride = EnvironmentVariablesHelper.GetExisting(variable.Name);
// It exists. Rename it to preserve it. // It exists. Rename it to preserve it.
if (variableToOverride != null) if (variableToOverride != null && variableToOverride.ParentType == VariablesSetType.User)
{ {
variableToOverride.Name = EnvironmentVariablesHelper.GetBackupVariableName(variableToOverride, this.Name); variableToOverride.Name = EnvironmentVariablesHelper.GetBackupVariableName(variableToOverride, this.Name);

4
src/modules/EnvironmentVariables/EnvironmentVariables/Models/VariablesSetType.cs
View File

@@ -6,7 +6,9 @@ namespace EnvironmentVariables.Models
{ {
public enum VariablesSetType public enum VariablesSetType
{ {
User = 0, Path = 0,
Duplicate,
User,
System, System,
Profile, Profile,
} }

10
src/modules/EnvironmentVariables/EnvironmentVariables/ViewModels/MainViewModel.cs
View File

@@ -140,6 +140,7 @@ namespace EnvironmentVariables.ViewModels
if (!string.IsNullOrEmpty(userPath.Name) && !string.IsNullOrEmpty(systemPath.Name)) if (!string.IsNullOrEmpty(userPath.Name) && !string.IsNullOrEmpty(systemPath.Name))
{ {
var clone = systemPath.Clone(); var clone = systemPath.Clone();
clone.ParentType = VariablesSetType.Path;
clone.Values += ";" + userPath.Values; clone.Values += ";" + userPath.Values;
variables.Remove(userPath); variables.Remove(userPath);
variables.Insert(variables.IndexOf(systemPath), clone); variables.Insert(variables.IndexOf(systemPath), clone);
@@ -155,13 +156,15 @@ namespace EnvironmentVariables.ViewModels
var userVar = duplicate.ElementAt(0); var userVar = duplicate.ElementAt(0);
var systemVar = duplicate.ElementAt(1); var systemVar = duplicate.ElementAt(1);
var clone = systemVar.Clone(); var clone = userVar.Clone();
clone.Values = userVar.Values; clone.ParentType = VariablesSetType.Duplicate;
clone.Name = systemVar.Name;
variables.Insert(variables.IndexOf(userVar), clone);
variables.Remove(userVar); variables.Remove(userVar);
variables.Insert(variables.IndexOf(systemVar), clone);
variables.Remove(systemVar); variables.Remove(systemVar);
} }
variables = variables.OrderBy(x => x.ParentType).ToList();
AppliedVariables = new ObservableCollection<Variable>(variables); AppliedVariables = new ObservableCollection<Variable>(variables);
} }
@@ -179,6 +182,7 @@ namespace EnvironmentVariables.ViewModels
} }
EnvironmentVariablesHelper.SetVariable(variable); EnvironmentVariablesHelper.SetVariable(variable);
PopulateAppliedVariables();
} }
internal void EditVariable(Variable original, Variable edited, ProfileVariablesSet variablesSet) internal void EditVariable(Variable original, Variable edited, ProfileVariablesSet variablesSet)