Skip to content

Commit 43cc15f

Browse files
committed
Remove now redundant setting to run all packages for a package manager with administrator rights
1 parent fbf97f0 commit 43cc15f

3 files changed

Lines changed: 1 addition & 33 deletions

File tree

src/UniGetUI.PackageEngine.Operations/PackageOperations.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ public PackageOperation(
5353
}
5454

5555
private bool RequiresAdminRights()
56-
{
57-
return Package.OverridenOptions.RunAsAdministrator is true
58-
|| Options.RunAsAdministrator
59-
|| (Settings.GetDictionaryItem<string, bool>("AlwaysElevate", Package.Manager.Name) && Package.OverridenOptions.RunAsAdministrator != false);
60-
}
56+
=> Package.OverridenOptions.RunAsAdministrator is true || Options.RunAsAdministrator;
6157

6258
protected override void ApplyRetryAction(string retryMode)
6359
{

src/UniGetUI/MainWindow.xaml.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -258,20 +258,6 @@ private static void TransferOldSettingsFormats()
258258

259259
Settings.Set("TransferredOldSettings", true);
260260
}
261-
262-
if (!Settings.Get("TransferredOldSettingsv2"))
263-
{
264-
foreach (IPackageManager Manager in PEInterface.Managers)
265-
{
266-
string SettingName = "AlwaysElevate" + Manager.Name;
267-
if (Settings.Get(SettingName))
268-
{
269-
Settings.SetDictionaryItem("AlwaysElevate", Manager.Name, true);
270-
Settings.Set(SettingName, false);
271-
}
272-
}
273-
Settings.Set("TransferredOldSettingsv2", true);
274-
}
275261
}
276262

277263
public void HandleNotificationActivation(AppNotificationActivatedEventArgs args)

src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
7676
SettingsTitle.Text = CoreTools.Translate("{0} settings", Manager.DisplayName);
7777
StatusTitle.Text = CoreTools.Translate("{0} status", Manager.DisplayName);
7878

79-
var AlwaysElevateManagerOP = new CheckboxCard_Dict()
80-
{
81-
Text = CoreTools.Translate("Always run {pm} operations with administrator rights").Replace("{pm}", Manager.DisplayName),
82-
DictionaryName = "AlwaysElevate",
83-
SettingName = Manager.Name,
84-
CornerRadius = new CornerRadius(8,8,0,0),
85-
BorderThickness = new Thickness(1,1,1,0),
86-
};
87-
8879
var DisableNotifsCard = new CheckboxCard_Dict()
8980
{
9081
Text = CoreTools.Translate("Ignore packages from {pm} when showing a notification about updates").Replace("{pm}", Manager.DisplayName),
@@ -119,7 +110,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
119110
{
120111
DisableNotifsCard.CornerRadius = new CornerRadius(0);
121112
DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0);
122-
ExtraControls.Children.Add(AlwaysElevateManagerOP);
123113
ExtraControls.Children.Add(DisableNotifsCard);
124114

125115
ButtonCard WinGet_ResetWindowsIPackageManager = new()
@@ -185,7 +175,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
185175
{
186176
DisableNotifsCard.CornerRadius = new CornerRadius(0);
187177
DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0);
188-
ExtraControls.Children.Add(AlwaysElevateManagerOP);
189178
ExtraControls.Children.Add(DisableNotifsCard);
190179

191180
ButtonCard Scoop_Install = new()
@@ -248,7 +237,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
248237
{
249238
DisableNotifsCard.CornerRadius = new CornerRadius(0);
250239
DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0);
251-
ExtraControls.Children.Add(AlwaysElevateManagerOP);
252240
ExtraControls.Children.Add(DisableNotifsCard);
253241

254242
CheckboxCard Chocolatey_SystemChoco = new()
@@ -267,7 +255,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
267255
{
268256
DisableNotifsCard.CornerRadius = new CornerRadius(0);
269257
DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0);
270-
ExtraControls.Children.Add(AlwaysElevateManagerOP);
271258
ExtraControls.Children.Add(DisableNotifsCard);
272259

273260
Settings.SetValue("DefaultVcpkgTriplet", Vcpkg.GetDefaultTriplet());
@@ -344,7 +331,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
344331
{
345332
DisableNotifsCard.CornerRadius = new CornerRadius(0, 0, 8, 8);
346333
DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 1);
347-
ExtraControls.Children.Add(AlwaysElevateManagerOP);
348334
ExtraControls.Children.Add(DisableNotifsCard);
349335
}
350336

0 commit comments

Comments
 (0)