Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions src/UniGetUI.Core.Tools/Tools.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 0 additions & 3 deletions src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/UniGetUI.PackageEngine.Operations/PackageOperations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, bool>("AlwaysElevate", Package.Manager.Name) && Package.OverridenOptions.RunAsAdministrator != false);
}

protected override void ApplyRetryAction(string retryMode)
Expand Down
2 changes: 0 additions & 2 deletions src/UniGetUI/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,7 +18,6 @@
using UniGetUI.Interface.Telemetry;
using UniGetUI.PackageEngine.Interfaces;
using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs;
using UniGetUI.Pages.SettingsPages;

namespace UniGetUI
{
Expand Down Expand Up @@ -379,7 +377,7 @@
MainWindow.DispatcherQueue.TryEnqueue(MainWindow.Activate);
}

public async void DisposeAndQuit(int outputCode = 0)

Check warning on line 380 in src/UniGetUI/App.xaml.cs

View workflow job for this annotation

GitHub Actions / test-codebase

This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread.
{
Logger.Warn("Quitting UniGetUI");
DWMThreadHelper.ChangeState_DWM(false);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/UniGetUI/Controls/TranslatedTextBlock.xaml.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
64 changes: 40 additions & 24 deletions src/UniGetUI/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Web;
Expand Down Expand Up @@ -118,8 +117,8 @@ public MainWindow()

_ = AutoUpdater.UpdateCheckLoop(this, UpdatesBanner);

if (!Settings.Get("TransferredOldSettings"))
TransferOldSettingsFormats();

TransferOldSettingsFormats();

Activated += (_, e) =>
{
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
12 changes: 0 additions & 12 deletions src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
13 changes: 0 additions & 13 deletions src/UniGetUI/Pages/SettingsPages/GeneralPages/Experimental.xaml.cs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
12 changes: 0 additions & 12 deletions src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 0 additions & 12 deletions src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -57,6 +46,6 @@
public string ShortTitle => CoreTools.Translate("Notification preferences");

public event EventHandler? RestartRequired;
public event EventHandler<Type>? NavigationRequested;

Check warning on line 49 in src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs

View workflow job for this annotation

GitHub Actions / test-codebase

The event 'Notifications.NavigationRequested' is never used
}
}
12 changes: 0 additions & 12 deletions src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -75,7 +63,7 @@
public string ShortTitle => CoreTools.Translate("Install and update preferences");

public event EventHandler? RestartRequired;
public event EventHandler<Type>? NavigationRequested;

Check warning on line 66 in src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs

View workflow job for this annotation

GitHub Actions / test-codebase

The event 'Operations.NavigationRequested' is never used

private void ParallelOperationCount_OnValueChanged(object sender, EventArgs e)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -32,7 +16,7 @@
public bool CanGoBack => false;
public string ShortTitle => CoreTools.Translate("WingetUI Settings");

public event EventHandler? RestartRequired;

Check warning on line 19 in src/UniGetUI/Pages/SettingsPages/GeneralPages/SettingsHomepage.xaml.cs

View workflow job for this annotation

GitHub Actions / test-codebase

The event 'SettingsHomepage.RestartRequired' is never used

public event EventHandler<Type>? NavigationRequested;

Expand Down
14 changes: 0 additions & 14 deletions src/UniGetUI/Pages/SettingsPages/GeneralPages/Startup.xaml.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
7 changes: 0 additions & 7 deletions src/UniGetUI/Pages/SettingsPages/ISettingsPage.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Loading
Loading