diff --git a/src/UniGetUI.Core.Tools/Tools.cs b/src/UniGetUI.Core.Tools/Tools.cs index fe80332b95..53065b44c1 100644 --- a/src/UniGetUI.Core.Tools/Tools.cs +++ b/src/UniGetUI.Core.Tools/Tools.cs @@ -1,8 +1,6 @@ using System.Collections; using System.Diagnostics; -using System.Globalization; using System.Net; -using System.Net.NetworkInformation; using System.Security.Cryptography; using System.Security.Principal; using System.Text; diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs b/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs index c8f2cb84ae..e925df9a46 100644 --- a/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs +++ b/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs @@ -1,12 +1,9 @@ using System.Diagnostics; using System.Runtime.InteropServices; -using System.Text.Json.Nodes; using System.Text.RegularExpressions; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.Interface.Enums; using UniGetUI.PackageEngine.Classes.Manager; -using UniGetUI.PackageEngine.Classes.Manager.Classes; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.ManagerClasses.Classes; diff --git a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs index a9ecc29d52..cc2cd0f57e 100644 --- a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs +++ b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs @@ -3,7 +3,6 @@ using System.Web; using UniGetUI.Core.Classes; using UniGetUI.Core.Data; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.Interfaces; diff --git a/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs b/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs index a981de5470..4777b2fd17 100644 --- a/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs +++ b/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs @@ -56,7 +56,7 @@ private bool RequiresAdminRights() { return Package.OverridenOptions.RunAsAdministrator is true || Options.RunAsAdministrator - || (Settings.Get("AlwaysElevate" + Package.Manager.Name) && Package.OverridenOptions.RunAsAdministrator != false); + || (Settings.GetDictionaryItem("AlwaysElevate", Package.Manager.Name) && Package.OverridenOptions.RunAsAdministrator != false); } protected override void ApplyRetryAction(string retryMode) diff --git a/src/UniGetUI/App.xaml.cs b/src/UniGetUI/App.xaml.cs index 547a3db15b..dadb8ad1c8 100644 --- a/src/UniGetUI/App.xaml.cs +++ b/src/UniGetUI/App.xaml.cs @@ -2,7 +2,6 @@ using System.Text.RegularExpressions; using Windows.ApplicationModel.Activation; using CommunityToolkit.WinUI.Helpers; -using H.NotifyIcon; using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; @@ -19,7 +18,6 @@ using UniGetUI.Interface.Telemetry; using UniGetUI.PackageEngine.Interfaces; using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs; -using UniGetUI.Pages.SettingsPages; namespace UniGetUI { diff --git a/src/UniGetUI/Controls/SettingsWidgets/SettingsPageButton.cs b/src/UniGetUI/Controls/SettingsWidgets/SettingsPageButton.cs index 602b514004..78e6f892ae 100644 --- a/src/UniGetUI/Controls/SettingsWidgets/SettingsPageButton.cs +++ b/src/UniGetUI/Controls/SettingsWidgets/SettingsPageButton.cs @@ -1,6 +1,5 @@ using CommunityToolkit.WinUI.Controls; using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; using UniGetUI.Core.Tools; using UniGetUI.Interface.Enums; diff --git a/src/UniGetUI/Controls/TranslatedTextBlock.xaml.cs b/src/UniGetUI/Controls/TranslatedTextBlock.xaml.cs index b540560f5e..d7eb2977b1 100644 --- a/src/UniGetUI/Controls/TranslatedTextBlock.xaml.cs +++ b/src/UniGetUI/Controls/TranslatedTextBlock.xaml.cs @@ -1,6 +1,5 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI/MainWindow.xaml.cs b/src/UniGetUI/MainWindow.xaml.cs index 52f45239ff..8b320915dc 100644 --- a/src/UniGetUI/MainWindow.xaml.cs +++ b/src/UniGetUI/MainWindow.xaml.cs @@ -1,4 +1,3 @@ -using System.Diagnostics; using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Web; @@ -118,8 +117,8 @@ public MainWindow() _ = AutoUpdater.UpdateCheckLoop(this, UpdatesBanner); - if (!Settings.Get("TransferredOldSettings")) - TransferOldSettingsFormats(); + + TransferOldSettingsFormats(); Activated += (_, e) => { @@ -177,38 +176,55 @@ private void ClearSubtitle() private static void TransferOldSettingsFormats() { - foreach (IPackageManager Manager in PEInterface.Managers) + if (!Settings.Get("TransferredOldSettings")) { - string SettingName = "Disable" + Manager.Name; - if (Settings.Get(SettingName)) + foreach (IPackageManager Manager in PEInterface.Managers) { - Settings.SetDictionaryItem("DisabledManagers", Manager.Name, true); - Settings.Set(SettingName, false); + string SettingName = "Disable" + Manager.Name; + if (Settings.Get(SettingName)) + { + Settings.SetDictionaryItem("DisabledManagers", Manager.Name, true); + Settings.Set(SettingName, false); + } } - } - // Dependency checks don't need to be transferred, because the worst case scenario is the user has to click the "don't show again" again + // Dependency checks don't need to be transferred, because the worst case scenario is the user has to click the "don't show again" again - foreach (string Page in new[]{ "Discover", "Installed", "Bundles", "Updates"}) - { - if (Settings.Get($"HideToggleFilters{Page}Page")) + foreach (string Page in new[]{ "Discover", "Installed", "Bundles", "Updates"}) { - Settings.SetDictionaryItem("HideToggleFilters", Page, true); - Settings.Set($"HideToggleFilters{Page}Page", false); - } + if (Settings.Get($"HideToggleFilters{Page}Page")) + { + Settings.SetDictionaryItem("HideToggleFilters", Page, true); + Settings.Set($"HideToggleFilters{Page}Page", false); + } - if (Settings.Get($"DisableInstantSearch{Page}Tab")) - { - Settings.SetDictionaryItem("DisableInstantSearch", Page, true); - Settings.Set($"DisableInstantSearch{Page}Tab", false); + if (Settings.Get($"DisableInstantSearch{Page}Tab")) + { + Settings.SetDictionaryItem("DisableInstantSearch", Page, true); + Settings.Set($"DisableInstantSearch{Page}Tab", false); + } + + if (!int.TryParse(Settings.GetValue($"SidepanelWidth{Page}Page"), out int sidepanelWidth)) sidepanelWidth = 250; + Settings.SetDictionaryItem("SidepanelWidths", Page, sidepanelWidth); + Settings.Set($"SidepanelWidth{Page}Page", false); } - if (!int.TryParse(Settings.GetValue($"SidepanelWidth{Page}Page"), out int sidepanelWidth)) sidepanelWidth = 250; - Settings.SetDictionaryItem("SidepanelWidths", Page, sidepanelWidth); - Settings.Set($"SidepanelWidth{Page}Page", false); + Settings.Set("TransferredOldSettings", true); } - Settings.Set("TransferredOldSettings", true); + if (!Settings.Get("TransferredOldSettingsv2")) + { + foreach (IPackageManager Manager in PEInterface.Managers) + { + string SettingName = "AlwaysElevate" + Manager.Name; + if (Settings.Get(SettingName)) + { + Settings.SetDictionaryItem("AlwaysElevate", Manager.Name, true); + Settings.Set(SettingName, false); + } + } + Settings.Set("TransferredOldSettingsv2", true); + } } public void HandleNotificationActivation(AppNotificationActivatedEventArgs args) diff --git a/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs b/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs index a079937fee..756393c347 100644 --- a/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs +++ b/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs @@ -5,7 +5,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using UniGetUI.Core.Tools; using UniGetUI.PackageEngine.Classes.Packages.Classes; using UniGetUI.Pages.DialogPages; diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml.cs index da6a6a0148..d1cdc3268b 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml.cs @@ -1,17 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml.cs index cc7496db11..dbf726d1d3 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml.cs @@ -1,17 +1,5 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Data; diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Experimental.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Experimental.xaml.cs index 632d10d991..b39fcf4e9c 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Experimental.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Experimental.xaml.cs @@ -1,17 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs index c2ef46288d..1800698038 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs @@ -1,17 +1,5 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; using UniGetUI.Pages.DialogPages; using Newtonsoft.Json; diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs index a248a7c0b6..674a1e03c2 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs @@ -1,16 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; using UniGetUI.Core.Data; diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs index b8d748606a..657baf517c 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs @@ -1,16 +1,5 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; using UniGetUI.Core.SettingsEngine; diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs index 1d6381be18..2a523a4ede 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs @@ -1,17 +1,5 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; using UniGetUI.Pages.DialogPages; using UniGetUI.PackageOperations; diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/SettingsHomepage.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/SettingsHomepage.xaml.cs index caa0402784..ac04111ef9 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/SettingsHomepage.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/SettingsHomepage.xaml.cs @@ -1,23 +1,7 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; -using UniGetUI.Interface.Widgets; using UniGetUI.Pages.SettingsPages.GeneralPages; -using UniGetUI.PackageEngine; -using Windows.ApplicationModel.Activation; -using UniGetUI.Core.SettingsEngine; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Startup.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Startup.xaml.cs index b06235da20..d10ce8c50e 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Startup.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Startup.xaml.cs @@ -1,18 +1,4 @@ - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; using System.Diagnostics; diff --git a/src/UniGetUI/Pages/SettingsPages/ISettingsPage.cs b/src/UniGetUI/Pages/SettingsPages/ISettingsPage.cs index 33bf30785e..33a1942148 100644 --- a/src/UniGetUI/Pages/SettingsPages/ISettingsPage.cs +++ b/src/UniGetUI/Pages/SettingsPages/ISettingsPage.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.Interface.Widgets; - namespace UniGetUI.Pages.SettingsPages { interface ISettingsPage diff --git a/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs b/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs index 01b97873be..7a798c3a1e 100644 --- a/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs @@ -1,22 +1,10 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; using UniGetUI.Interface.Widgets; using UniGetUI.Pages.SettingsPages.GeneralPages; using UniGetUI.PackageEngine; -using Windows.ApplicationModel.Activation; using UniGetUI.Core.SettingsEngine; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml b/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml index e431435054..c304e4a009 100644 --- a/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml +++ b/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml @@ -17,7 +17,7 @@ - + @@ -61,9 +61,9 @@ - + - + - + diff --git a/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs b/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs index 4596500ce7..1e6004d7f0 100644 --- a/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs @@ -1,20 +1,7 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Navigation; -using Microsoft.VisualBasic; using UniGetUI.Core.Tools; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Interfaces; using System.Diagnostics; using UniGetUI.PackageEngine.Managers.WingetManager; @@ -30,7 +17,6 @@ using UniGetUI.PackageEngine.Managers.DotNetManager; using ExternalLibraries.Clipboard; using CommunityToolkit.WinUI.Controls; -using System.Reflection; using UniGetUI.Interface.Widgets; using UniGetUI.Core.Data; using UniGetUI.Pages.DialogPages; @@ -86,11 +72,21 @@ protected override void OnNavigatedTo(NavigationEventArgs e) EnableManager.SettingName = Manager.Name; EnableManager.Text = CoreTools.Translate("Enable {pm}").Replace("{pm}", Manager.DisplayName); - var AlwaysElevateManagerOP = new CheckboxCard() + var AlwaysElevateManagerOP = new CheckboxCard_Dict() { Text = CoreTools.Translate("Always run {pm} operations with administrator rights").Replace("{pm}", Manager.DisplayName), - SettingName = "AlwaysElevate" + Manager.Name, - CornerRadius = new CornerRadius(8) + DictionaryName = "AlwaysElevate", + SettingName = Manager.Name, + CornerRadius = new CornerRadius(8,8,0,0), + BorderThickness = new Thickness(1,1,1,0), + }; + + var DisableNotifsCard = new CheckboxCard_Dict() + { + Text = CoreTools.Translate("Ignore packages from {pm} when showing a notification about updates").Replace("{pm}", Manager.DisplayName), + DictionaryName = "DisabledPackageManagerNotifications", + ForceInversion = true, + SettingName = Manager.Name }; ManagerLogsLabel.Text = CoreTools.Translate("View {0} logs", Manager.DisplayName); @@ -115,9 +111,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e) if (Manager is WinGet) { - AlwaysElevateManagerOP.CornerRadius = new CornerRadius(8, 8, 0, 0); - AlwaysElevateManagerOP.BorderThickness = new Thickness(1, 1, 1, 0); + DisableNotifsCard.CornerRadius = new CornerRadius(0); + DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0); ExtraControls.Children.Add(AlwaysElevateManagerOP); + ExtraControls.Children.Add(DisableNotifsCard); ButtonCard WinGet_ResetWindowsIPackageManager = new() { @@ -180,9 +177,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e) else if (Manager is Scoop) { - AlwaysElevateManagerOP.CornerRadius = new CornerRadius(8, 8, 0, 0); - AlwaysElevateManagerOP.BorderThickness = new Thickness(1, 1, 1, 0); + DisableNotifsCard.CornerRadius = new CornerRadius(0); + DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0); ExtraControls.Children.Add(AlwaysElevateManagerOP); + ExtraControls.Children.Add(DisableNotifsCard); ButtonCard Scoop_Install = new() { @@ -235,9 +233,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e) else if (Manager is Chocolatey) { - AlwaysElevateManagerOP.CornerRadius = new CornerRadius(8, 8, 0, 0); - AlwaysElevateManagerOP.BorderThickness = new Thickness(1, 1, 1, 0); + DisableNotifsCard.CornerRadius = new CornerRadius(0); + DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0); ExtraControls.Children.Add(AlwaysElevateManagerOP); + ExtraControls.Children.Add(DisableNotifsCard); CheckboxCard Chocolatey_SystemChoco = new() { @@ -253,9 +252,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e) else if (Manager is Vcpkg) { - AlwaysElevateManagerOP.CornerRadius = new CornerRadius(8, 8, 0, 0); - AlwaysElevateManagerOP.BorderThickness = new Thickness(1, 1, 1, 0); + DisableNotifsCard.CornerRadius = new CornerRadius(0); + DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0); ExtraControls.Children.Add(AlwaysElevateManagerOP); + ExtraControls.Children.Add(DisableNotifsCard); Settings.SetValue("DefaultVcpkgTriplet", Vcpkg.GetDefaultTriplet()); ComboboxCard Vcpkg_DefaultTriplet = new() @@ -329,9 +329,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e) // -------------------------------- DEFAULT EXTRA SETTINGS -------------------------------------- else { - AlwaysElevateManagerOP.CornerRadius = new CornerRadius(8); - AlwaysElevateManagerOP.BorderThickness = new Thickness(1); + DisableNotifsCard.CornerRadius = new CornerRadius(0,0,8,8); + DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 1); ExtraControls.Children.Add(AlwaysElevateManagerOP); + ExtraControls.Children.Add(DisableNotifsCard); } base.OnNavigatedTo(e); diff --git a/src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs b/src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs index 9c2e7a3e9d..d4a256d296 100644 --- a/src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs @@ -1,20 +1,8 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; using Microsoft.UI.Xaml.Media.Animation; -using UniGetUI.PackageEngine.Interfaces; using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.Pages.SettingsPages.GeneralPages; using UniGetUI.Interface.Pages; diff --git a/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs b/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs index 5bc6654b18..a7975a2d3b 100644 --- a/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs +++ b/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs @@ -344,8 +344,8 @@ protected override void WhenPackagesLoaded(ReloadReason reason) if (upgradablePackages.Count == 0) return; - bool EnableAutoUpdate = Settings.Get("AutomaticallyUpdatePackages") || - Environment.GetCommandLineArgs().Contains("--updateapps"); + bool EnableAutoUpdate = Settings.Get("AutomaticallyUpdatePackages"); + EnableAutoUpdate |= Environment.GetCommandLineArgs().Contains("--updateapps"); if (EnableAutoUpdate) UpdateAll(); @@ -400,7 +400,8 @@ protected override void WhenPackagesLoaded(ReloadReason reason) string attribution = ""; foreach (IPackage package in upgradablePackages) { - attribution += package.Name + ", "; + if (!Settings.GetDictionaryItem("DisabledPackageManagerNotifications", package.Manager.Name)) + attribution += package.Name + ", "; } attribution = attribution.TrimEnd(' ').TrimEnd(','); @@ -441,8 +442,20 @@ protected override void WhenPackagesLoaded(ReloadReason reason) } } - notification.ExpiresOnReboot = true; - AppNotificationManager.Default.Show(notification); + bool SendNotification = false; + foreach (var Package in upgradablePackages) + { + if (!Settings.GetDictionaryItem("DisabledPackageManagerNotifications", Package.Manager.Name)) + { + SendNotification = true; + break; + } + } + if (SendNotification) + { + notification.ExpiresOnReboot = true; + AppNotificationManager.Default.Show(notification); + } } catch (Exception ex) {