Skip to content

Portable Tool for an Ideal Windows Setup

fix OneDrive detection & add system icon extraction for tweaks

Greedeks9eeb8404696e
diff --git a/.Source/GTweak/Core/ViewModel/InterfaceViewModel.cs b/.Source/GTweak/Core/ViewModel/InterfaceViewModel.cs
index d640f09d..4ab6d117 100644
--- a/.Source/GTweak/Core/ViewModel/InterfaceViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/InterfaceViewModel.cs
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Windows;
+using System.Windows.Media;
using GTweak.Core.Base;
using GTweak.Core.Model;
using GTweak.Utilities.Configuration;
@@ -14,6 +15,14 @@ namespace GTweak.Core.ViewModel
public Visibility Win11FeatureAvailable => HardwareData.OS.IsWin11 && HardwareData.OS.Build.CompareTo(22621.2361m) >= 0 ? Visibility.Visible : Visibility.Collapsed;
public bool IsBlockWithoutLicense => WinLicenseHandler.IsWindowsActivated;
public Visibility OneDriveAvailable => UninstallingPakages.IsOneDriveInstalled ? Visibility.Visible : Visibility.Collapsed;
+ public ImageSource HomeIcon => IconExtractProvider.GetStockIcon(IconExtractProvider.StockIconType.Home);
+ public ImageSource GalleryIcon => IconExtractProvider.GetStockIcon(IconExtractProvider.StockIconType.Gallery);
+ public ImageSource OneDriveIcon => IconExtractProvider.GetStockIcon(IconExtractProvider.StockIconType.OneDrive);
+ public ImageSource PCIcon => IconExtractProvider.GetStockIcon(IconExtractProvider.StockIconType.PC);
+ public ImageSource NetworkIcon => IconExtractProvider.GetStockIcon(IconExtractProvider.StockIconType.Network);
+ public ImageSource TrashIcon => IconExtractProvider.GetStockIcon(IconExtractProvider.StockIconType.Trash);
+ public ImageSource PanelIcon => IconExtractProvider.GetStockIcon(IconExtractProvider.StockIconType.Panel);
+ public ImageSource UserIcon => IconExtractProvider.GetStockIcon(IconExtractProvider.StockIconType.User);
protected override IReadOnlyDictionary<string, object> GetControlStates() => InterfaceTweaks.ControlStates;
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index c1e338c5..88059348 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -170,6 +170,7 @@
<Compile Include="Core\ViewModel\SystemViewModel.cs" />
<Compile Include="Core\ViewModel\ToolsetViewModel.cs" />
<Compile Include="Utilities\Animation\BlurAnimation.cs" />
+ <Compile Include="Utilities\Configuration\IconExtractProvider.cs" />
<Compile Include="Utilities\Configuration\NetworkProvider.cs" />
<Compile Include="Utilities\Configuration\StorageTypeIdentifier.cs" />
<Compile Include="Utilities\Configuration\HardwareData.cs" />
diff --git a/.Source/GTweak/Properties/AssemblyInfo.cs b/.Source/GTweak/Properties/AssemblyInfo.cs
index 5fc38485..06072810 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.cs
+++ b/.Source/GTweak/Properties/AssemblyInfo.cs
@@ -7,9 +7,9 @@ using System.Windows;
[assembly: AssemblyProduct("GTweak")]
[assembly: AssemblyCopyright("� 2024-2026 Greedeks")]
[assembly: AssemblyTrademark("Greedeks")]
-[assembly: AssemblyInformationalVersion("Build: 5.4.7")]
-[assembly: AssemblyVersion("5.4.61.502")]
-[assembly: AssemblyFileVersion("5.4.61.502")]
+[assembly: AssemblyInformationalVersion("Build: 5.4.8")]
+[assembly: AssemblyVersion("5.4.34.666")]
+[assembly: AssemblyFileVersion("5.4.34.666")]
[assembly: ComVisible(false)]
diff --git a/.Source/GTweak/Properties/AssemblyInfo.tt b/.Source/GTweak/Properties/AssemblyInfo.tt
index a63e932d..259aef6e 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.tt
+++ b/.Source/GTweak/Properties/AssemblyInfo.tt
@@ -22,7 +22,7 @@ using System.Windows;
[assembly: AssemblyMetadata("RepositoryType", "git")]
<#+
- private const string majorVersion = "Build: 5.4.7";
+ private const string majorVersion = "Build: 5.4.8";
private string GenerateVersion()
{
diff --git a/.Source/GTweak/Utilities/Configuration/IconExtractProvider.cs b/.Source/GTweak/Utilities/Configuration/IconExtractProvider.cs
new file mode 100644
index 00000000..d91f9a49
--- /dev/null
+++ b/.Source/GTweak/Utilities/Configuration/IconExtractProvider.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace GTweak.Utilities.Configuration
+{
+ internal static class IconExtractProvider
+ {
+ [DllImport("Shell32.dll", EntryPoint = "ExtractIconExW", CharSet = CharSet.Unicode, ExactSpelling = true, CallingConvention = CallingConvention.StdCall)]
+ private static extern int ExtractIconEx(string sFile, int iIndex, out IntPtr piLargeVersion, out IntPtr piSmallVersion, int amountIcons);
+
+ [DllImport("user32.dll", SetLastError = true)]
+ private static extern bool DestroyIcon(IntPtr hIcon);
+
+ private static readonly ConcurrentDictionary<(string, int, bool), ImageSource> _iconCache = new ConcurrentDictionary<(string, int, bool), ImageSource>();
+
+ internal enum StockIconType { Home, Gallery, PC, Network, Trash, Panel, User, OneDrive }
+
+ private static readonly Dictionary<StockIconType, (string file, int index)> _stockIconMappings = new Dictionary<StockIconType, (string, int)>
+ {
+ { StockIconType.Home, ("shell32.dll", -51380) },
+ { StockIconType.Gallery, ("shell32.dll", -51586) },
+ { StockIconType.PC, ("imageres.dll", -109) },
+ { StockIconType.Network, ("imageres.dll", -25) },
+ { StockIconType.Trash, ("imageres.dll", -54) },
+ { StockIconType.Panel, ("imageres.dll", -27) },
+ { StockIconType.User, ("imageres.dll", -123) },
+ { StockIconType.OneDrive, ("imageres.dll", -1040) }
+ };
+
+ internal static ImageSource GetStockIcon(StockIconType type)
+ {
+ if (_stockIconMappings.TryGetValue(type, out (string file, int index) iconInfo))
+ {
+ return GetIcon(iconInfo.file, iconInfo.index);
+ }
+ return null;
+ }
+
+ internal static ImageSource GetIcon(string file, int index, bool large = true)
+ {
+ (string, int index, bool large) key = (file.ToLowerInvariant(), index, large);
+
+ if (_iconCache.TryGetValue(key, out ImageSource cached))
+ {
+ return cached;
+ }
+
+ ImageSource icon = ExtractIconInternal(file, index, large);
+ if (icon != null)
+ {
+ _iconCache[key] = icon;
+ }
+ return icon;
+ }
+
+ private static ImageSource ExtractIconInternal(string file, int index, bool large)
+ {
+ IntPtr hLargeIcon = IntPtr.Zero;
+ IntPtr hSmallIcon = IntPtr.Zero;
+
+ try
+ {
+ int readIconCount = ExtractIconEx(file, index, out hLargeIcon, out hSmallIcon, 1);
+
+ if (readIconCount <= 0)
+ {
+ return null;
+ }
+
+ IntPtr hIconToUse = large ? hLargeIcon : hSmallIcon;
+
+ if (hIconToUse == IntPtr.Zero)
+ {
+ return null;
+ }
+
+ ImageSource imageSource = Imaging.CreateBitmapSourceFromHIcon(hIconToUse, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
+ imageSource.Freeze();
+
+ return imageSource;
+ }
+ catch { return null; }
+ finally
+ {
+ if (hLargeIcon != IntPtr.Zero)
+ {
+ DestroyIcon(hLargeIcon);
+ }
+
+ if (hSmallIcon != IntPtr.Zero)
+ {
+ DestroyIcon(hSmallIcon);
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/.Source/GTweak/Utilities/Managers/ExplorerManager.cs b/.Source/GTweak/Utilities/Managers/ExplorerManager.cs
index 98c2e093..0f3a88fb 100644
--- a/.Source/GTweak/Utilities/Managers/ExplorerManager.cs
+++ b/.Source/GTweak/Utilities/Managers/ExplorerManager.cs
@@ -25,6 +25,9 @@ namespace GTweak.Utilities.Managers
internal static readonly Dictionary<string, ExplorerAction> IntfActions = new Dictionary<string, ExplorerAction>()
{
+ ["Checkbox1"] = ExplorerAction.Restart,
+ ["Checkbox2"] = ExplorerAction.Restart,
+ ["Checkbox3"] = ExplorerAction.Restart,
["Checkbox4"] = ExplorerAction.Restart,
["Checkbox5"] = ExplorerAction.Restart,
["Checkbox6"] = ExplorerAction.Restart,
diff --git a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
index 8b2f31a6..9aa0ba3e 100644
--- a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
+++ b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
@@ -33,7 +33,7 @@ namespace GTweak.Utilities.Tweaks
}
}
- internal static bool IsOneDriveInstalled => File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "OneDrive", "OneDrive.exe")) ||
+ internal static bool IsOneDriveInstalled => Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "OneDrive")) ||
File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Microsoft OneDrive", "OneDrive.exe")) || File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft OneDrive", "OneDrive.exe"));
internal static bool IsEdgeInstalled => Directory.Exists(PathLocator.Folders.Edge);
@@ -150,10 +150,7 @@ namespace GTweak.Utilities.Tweaks
string output = CommandExecutor.GetCommandOutput("Get-LocalUser | Where-Object { $_.Enabled -match 'True'} | Select-Object -ExpandProperty PrincipalSource").GetAwaiter().GetResult();
_isLocalAccount = output.IndexOf("MicrosoftAccount", StringComparison.OrdinalIgnoreCase) < 0;
}
- catch
- {
- _isLocalAccount = false;
- }
+ catch { _isLocalAccount = false; }
}
internal static async Task RestoreOneDriveFolder()
diff --git a/.Source/GTweak/View/InterfaceView.xaml b/.Source/GTweak/View/InterfaceView.xaml
index cd3b1f64..3b764562 100644
--- a/.Source/GTweak/View/InterfaceView.xaml
+++ b/.Source/GTweak/View/InterfaceView.xaml
@@ -42,10 +42,25 @@
<StackPanel Orientation="Horizontal" Height="45" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" Visibility="{Binding Win11FeatureOnly}" ToolTip="{DynamicResource exblock1_desc_intf}" ToolTipService.IsEnabled="False" Background="Transparent">
<TextBlock Style="{StaticResource TextDefault}" VerticalAlignment="Center" Text="{DynamicResource exblock1_intf}"/>
- <uc:ExpandableBox Text="{DynamicResource btn_change}" Margin="7,5,5,0" Height="32" VerticalAlignment="Center">
- <CheckBox x:Uid="Checkbox1" Content="{DynamicResource chk_home_intf}" IsChecked="{Binding [Checkbox1].State}" Click="CheckBox_Click" />
- <CheckBox x:Uid="Checkbox2" Content="{DynamicResource chk_gallery_intf}" IsChecked="{Binding [Checkbox2].State}" Margin="0,4,0,0" Click="CheckBox_Click"/>
- <CheckBox x:Uid="Checkbox3" Content="{DynamicResource OneDrive_pkg}" IsChecked="{Binding [Checkbox3].State}" Margin="0,4,0,0" Click="CheckBox_Click" Visibility="{Binding OneDriveAvailable}"/>
+ <uc:ExpandableBox Text="{DynamicResource btn_change}" Margin="7,5,5,0" Height="32" VerticalAlignment="Center" Closed="ExpandableBox_Closed">
+ <CheckBox x:Uid="Checkbox1" IsChecked="{Binding [Checkbox1].State}" Click="CheckBox_Click">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding HomeIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource chk_home_intf}" Margin="5,0,0,0"/>
+ </StackPanel>
+ </CheckBox>
+ <CheckBox x:Uid="Checkbox2" IsChecked="{Binding [Checkbox2].State}" Margin="0,4,0,0" Click="CheckBox_Click">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding GalleryIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource chk_gallery_intf}" Margin="5,0,0,0"/>
+ </StackPanel>
+ </CheckBox>
+ <CheckBox x:Uid="Checkbox3" Visibility="{Binding OneDriveAvailable}" IsChecked="{Binding [Checkbox3].State}" Margin="0,4,0,0" Click="CheckBox_Click">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding OneDriveIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource OneDrive_pkg}" Margin="5,0,0,0"/>
+ </StackPanel>
+ </CheckBox>
</uc:ExpandableBox>
</StackPanel>
</StackPanel>
@@ -54,22 +69,55 @@
<StackPanel Orientation="Horizontal" Height="45" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ToolTip="{DynamicResource exblock2_desc_intf}" ToolTipService.IsEnabled="False" Background="Transparent">
<TextBlock Style="{StaticResource TextDefault}" VerticalAlignment="Center" Text="{DynamicResource exblock2_intf}"/>
<uc:ExpandableBox Text="{DynamicResource btn_change}" Margin="7,5,5,0" Height="32" VerticalAlignment="Center" Closed="ExpandableBox_Closed">
- <CheckBox x:Uid="Checkbox4" Content="{DynamicResource chk_hidden_intf}" IsChecked="{Binding [Checkbox4].State}" Click="CheckBox_Click" />
- <CheckBox x:Uid="Checkbox5" Content="{DynamicResource chk_system_intf}" IsChecked="{Binding [Checkbox5].State}" Margin="0,4,0,0" Click="CheckBox_Click" />
- <CheckBox x:Uid="Checkbox6" Content="{DynamicResource chk_extension_intf}" IsChecked="{Binding [Checkbox6].State}" Margin="0,4,0,0" Click="CheckBox_Click" />
- <CheckBox x:Uid="Checkbox7" Content="{DynamicResource chk_emptydrives_intf}" IsChecked="{Binding [Checkbox7].State}" Margin="0,4,0,0" Click="CheckBox_Click" />
+ <CheckBox x:Uid="Checkbox4" Content="{DynamicResource chk_hidden_intf}" IsChecked="{Binding [Checkbox4].State}" Click="CheckBox_Click"/>
+ <CheckBox x:Uid="Checkbox5" Content="{DynamicResource chk_system_intf}" IsChecked="{Binding [Checkbox5].State}" Margin="0,4,0,0" Click="CheckBox_Click"/>
+ <CheckBox x:Uid="Checkbox6" Content="{DynamicResource chk_extension_intf}" IsChecked="{Binding [Checkbox6].State}" Margin="0,4,0,0" Click="CheckBox_Click"/>
+ <CheckBox x:Uid="Checkbox7" Content="{DynamicResource chk_emptydrives_intf}" IsChecked="{Binding [Checkbox7].State}" Margin="0,4,0,0" Click="CheckBox_Click"/>
</uc:ExpandableBox>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="45" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ToolTip="{DynamicResource exblock3_desc_intf}" ToolTipService.IsEnabled="False" Background="Transparent">
<TextBlock Style="{StaticResource TextDefault}" VerticalAlignment="Center" Text="{DynamicResource exblock3_intf}"/>
<uc:ExpandableBox Text="{DynamicResource btn_change}" Margin="7,5,5,0" Height="32" VerticalAlignment="Center" Closed="ExpandableBox_Closed">
- <CheckBox x:Uid="Checkbox8" Content="{DynamicResource chk_pc_intf}" IsChecked="{Binding [Checkbox8].State}" Click="CheckBox_Click" />
- <CheckBox x:Uid="Checkbox9" Content="{DynamicResource chk_net_intf}" IsChecked="{Binding [Checkbox9].State}" Margin="0,4,0,0" Click="CheckBox_Click"/>
- <CheckBox x:Uid="Checkbox10" Content="{DynamicResource chk_trash_intf}" IsChecked="{Binding [Checkbox10].State}" Margin="0,4,0,0" Click="CheckBox_Click"/>
- <CheckBox x:Uid="Checkbox11" Content="{DynamicResource chk_panel_intf}" IsChecked="{Binding [Checkbox11].State}" Margin="0,4,0,0" Click="CheckBox_Click"/>
- <CheckBox x:Uid="Checkbox12" Content="{DynamicResource chk_user_intf}" IsChecked="{Binding [Checkbox12].State}" Margin="0,4,0,0" Click="CheckBox_Click"/>
- <CheckBox x:Uid="Checkbox13" Content="{DynamicResource OneDrive_pkg}" IsChecked="{Binding [Checkbox13].State}" Margin="0,4,0,0" Click="CheckBox_Click" Visibility="{Binding OneDriveAvailable}"/>
+ <CheckBox x:Uid="Checkbox8" IsChecked="{Binding [Checkbox8].State}" Click="CheckBox_Click">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding PCIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource chk_pc_intf}" Margin="5,0,0,0"/>
+ </StackPanel>
+ </CheckBox>
+ <CheckBox x:Uid="Checkbox9" IsChecked="{Binding [Checkbox9].State}" Click="CheckBox_Click" Margin="0,4,0,0">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding NetworkIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource chk_net_intf}" Style="{StaticResource TextDefault}" Margin="5,0,0,0" FontSize="14px"/>
+ </StackPanel>
+ </CheckBox>
+ <CheckBox x:Uid="Checkbox10" IsChecked="{Binding [Checkbox10].State}" Click="CheckBox_Click" Margin="0,4,0,0">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding TrashIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource chk_trash_intf}" Style="{StaticResource TextDefault}" Margin="5,0,0,0" FontSize="14px"/>
+ </StackPanel>
+ </CheckBox>
+
+ <CheckBox x:Uid="Checkbox11" IsChecked="{Binding [Checkbox11].State}" Click="CheckBox_Click" Margin="0,4,0,0">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding PanelIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource chk_panel_intf}" Style="{StaticResource TextDefault}" Margin="5,0,0,0" FontSize="14px"/>
+ </StackPanel>
+ </CheckBox>
+
+ <CheckBox x:Uid="Checkbox12" IsChecked="{Binding [Checkbox12].State}" Click="CheckBox_Click" Margin="0,4,0,0">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding UserIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource chk_user_intf}" Style="{StaticResource TextDefault}" Margin="5,0,0,0" FontSize="14px"/>
+ </StackPanel>
+ </CheckBox>
+
+ <CheckBox x:Uid="Checkbox13" Visibility="{Binding OneDriveAvailable}" IsChecked="{Binding [Checkbox13].State}" Click="CheckBox_Click" Margin="0,4,0,0">
+ <StackPanel Orientation="Horizontal" Background="Transparent">
+ <Image Source="{Binding OneDriveIcon}" Width="16" Height="16"/>
+ <TextBlock Text="{DynamicResource OneDrive_pkg}" Style="{StaticResource TextDefault}" Margin="5,0,0,0" FontSize="14px"/>
+ </StackPanel>
+ </CheckBox>
</uc:ExpandableBox>
</StackPanel>
</StackPanel>
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index 5e79ca98..ef987250 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -46,6 +46,7 @@ namespace GTweak.View
DescBlock.Text = description;
}
}
+
private void Tweak_MouseLeave(object sender, MouseEventArgs e) => DescBlock.Text = DescBlock.DefaultText;
private void ColorPicker_ColorPicked(object sender, EventArgs e)
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index 18471d3f..cb9aae16 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -56,17 +56,17 @@ namespace GTweak.Windows
catch (Exception ex) { ErrorLogging.LogWritingFile(ex, false, member); }
}
- ReportStep(1, 15, 300);
+ ReportStep(1, 15);
ExecuteWithLogging(WinLicenseHandler.LicenseStatus, nameof(WinLicenseHandler.LicenseStatus));
ExecuteWithLogging(TrustedInstaller.StartTrustedInstallerService, nameof(TrustedInstaller.StartTrustedInstallerService));
ExecuteWithLogging(RunGuard.CheckingDefenderExclusions, nameof(RunGuard.CheckingDefenderExclusions));
- ReportStep(2, 35, 300);
+ ReportStep(2, 35);
ExecuteWithLogging(SystemTweaks.ViewConfigTick, nameof(SystemTweaks.ViewConfigTick));
ExecuteWithLogging(SystemTweaks.ViewBluetoothStatus, nameof(SystemTweaks.ViewBluetoothStatus));
ExecuteWithLogging(SystemTweaks.ViewNetshState, nameof(SystemTweaks.ViewNetshState));
- ReportStep(3, 55, 150);
+ ReportStep(3, 55);
ExecuteWithLogging(_hardwareProvider.GetHardwareData, nameof(_hardwareProvider.GetHardwareData));
ExecuteWithLogging(() => _hardwareProvider.GetProcessCount().GetAwaiter().GetResult(), nameof(_hardwareProvider.GetProcessCount));
ExecuteWithLogging(() => _hardwareProvider.GetServicesCount().GetAwaiter().GetResult(), nameof(_hardwareProvider.GetServicesCount));
@@ -77,7 +77,7 @@ namespace GTweak.Windows
ExecuteWithLogging(_uninstallingPakages.GetInstalledPackages, nameof(_uninstallingPakages.GetInstalledPackages));
ExecuteWithLogging(UninstallingPakages.CheckingForLocalAccount, nameof(UninstallingPakages.CheckingForLocalAccount));
- ReportStep(5, 90, 150);
+ ReportStep(5, 90);
ExecuteWithLogging(() => _hardwareProvider.GetUserIpAddress().GetAwaiter().GetResult(), nameof(_hardwareProvider.GetUserIpAddress));
ExecuteWithLogging(() => _hardwareProvider.ValidateVersionUpdates().GetAwaiter().GetResult(), nameof(_hardwareProvider.ValidateVersionUpdates));
ReportStep(6, 100, 400);
diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.cs
index dddb6ea6..b67125ec 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs
@@ -12,7 +12,6 @@ using System.Windows.Threading;
using GTweak.Utilities.Animation;
using GTweak.Utilities.Configuration;
using GTweak.Utilities.Controls;
-using GTweak.Utilities.Helpers;
using GTweak.Utilities.Managers;
using Wpf.Ui.Controls;
@@ -48,8 +47,6 @@ namespace GTweak.Windows
InitializeComponent();
OverlayDialogManager.Initialize(OverlayDialog, DialogTitle, DialogText, DialogQuestion, DialogBtnPrimary, DialogBtnSecondary);
App.TweaksImported += delegate { BtnUtils.IsChecked = true; };
-
- CommandExecutor.RunCommandAsTrustedInstaller($"/c del /f \"{PathLocator.Targets.Defender.SmartScreen}\"");
}
protected override void OnSourceInitialized(EventArgs e)