Skip to content

Portable Tool for an Ideal Windows Setup

-extra code has been removed & re

Greedekse9b20ec190d9
diff --git a/.Source/GTweak/Utilities/Tweaks/Firewall.cs b/.Source/GTweak/Utilities/Tweaks/Firewall.cs
index 8074a455..367167c5 100644
--- a/.Source/GTweak/Utilities/Tweaks/Firewall.cs
+++ b/.Source/GTweak/Utilities/Tweaks/Firewall.cs
@@ -1,7 +1,6 @@
using NetFwTypeLib;
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using System.Windows;
@@ -37,47 +36,30 @@ namespace GTweak.Utilities.Tweaks
return isCheck;
}
-
protected static void BlockWindowsUpdate(bool isChoose)
{
try
{
- if (CheckRulesWindows(NameRules["Update"]) && isChoose)
+ Parallel.Invoke(() =>
{
- Parallel.Invoke(() =>
- {
- AddRulesIn(isChoose, File.Exists(PathsForPrograms["MoUso_New"]) ? PathsForPrograms["MoUso_New"] : PathsForPrograms["MoUso_Old"], NameRules["Update"]);
- AddRulesIn(isChoose, PathsForPrograms["Uso"], string.Concat(NameRules["Update"], " (Update Orchestrator)"));
- },
- () =>
- {
- AddRulesOut(isChoose, File.Exists(PathsForPrograms["MoUso_New"]) ? PathsForPrograms["MoUso_New"] : PathsForPrograms["MoUso_Old"], NameRules["Update"]);
- AddRulesOut(isChoose, PathsForPrograms["Uso"], string.Concat(NameRules["Update"], " (Update Orchestrator)"));
- });
- }
- else
+ ChangeRulesIn(isChoose, File.Exists(PathsForPrograms["MoUso_New"]) ? PathsForPrograms["MoUso_New"] : PathsForPrograms["MoUso_Old"], NameRules["Update"]);
+ ChangeRulesIn(isChoose, PathsForPrograms["Uso"], string.Concat(NameRules["Update"], " (Update Orchestrator)"));
+ });
+ }
+ catch { new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]); }
+
+ try
+ {
+ Parallel.Invoke(() =>
{
- Parallel.Invoke(() =>
- {
- try
- {
- AddRulesIn(isChoose, File.Exists(PathsForPrograms["MoUso_New"]) ? PathsForPrograms["MoUso_New"] : PathsForPrograms["MoUso_Old"], NameRules["Update"]);
- AddRulesIn(isChoose, PathsForPrograms["Uso"], string.Concat(NameRules["Update"], " (Update Orchestrator)"));
- }
- catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
- try
- {
- AddRulesIn(isChoose, File.Exists(PathsForPrograms["MoUso_New"]) ? PathsForPrograms["MoUso_New"] : PathsForPrograms["MoUso_Old"], NameRules["Update"]);
- AddRulesOut(isChoose, PathsForPrograms["Uso"], string.Concat(NameRules["Update"], " (Update Orchestrator)"));
- }
- catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
- });
- }
+ ChangeRulesOut(isChoose, File.Exists(PathsForPrograms["MoUso_New"]) ? PathsForPrograms["MoUso_New"] : PathsForPrograms["MoUso_Old"], NameRules["Update"]);
+ ChangeRulesOut(isChoose, PathsForPrograms["Uso"], string.Concat(NameRules["Update"], " (Update Orchestrator)"));
+ });
}
catch { new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]); }
}
- private static void AddRulesIn(in bool isChoose, in string pathProgram, in string nameRule, in string description = "Windows update blocking")
+ private static void ChangeRulesIn(in bool isChoose, in string pathProgram, in string nameRule, in string description = "Windows update blocking")
{
INetFwRule firewallRule = (INetFwRule)Activator.CreateInstance(Type.GetTypeFromProgID("HNetCfg.FWRule"));
INetFwPolicy2 firewallPolicy = (INetFwPolicy2)Activator.CreateInstance(Type.GetTypeFromProgID("HNetCfg.FwPolicy2"));
@@ -92,14 +74,15 @@ namespace GTweak.Utilities.Tweaks
if (isChoose)
{
- firewallPolicy.Rules.Remove(nameRule);
+ if (CheckRulesWindows(nameRule))
+ firewallPolicy.Rules.Remove(nameRule);
firewallPolicy.Rules.Add(firewallRule);
}
else
firewallPolicy.Rules.Remove(nameRule);
}
- private static void AddRulesOut(in bool isChoose, in string pathProgram, in string nameRule, in string description = "Windows update blocking")
+ private static void ChangeRulesOut(in bool isChoose, in string pathProgram, in string nameRule, in string description = "Windows update blocking")
{
INetFwRule firewallRule = (INetFwRule)Activator.CreateInstance(Type.GetTypeFromProgID("HNetCfg.FWRule"));
INetFwPolicy2 firewallPolicy = (INetFwPolicy2)Activator.CreateInstance(Type.GetTypeFromProgID("HNetCfg.FwPolicy2"));
@@ -114,25 +97,17 @@ namespace GTweak.Utilities.Tweaks
if (isChoose)
{
- firewallPolicy.Rules.Remove(nameRule);
+ if (CheckRulesWindows(nameRule))
+ firewallPolicy.Rules.Remove(nameRule);
firewallPolicy.Rules.Add(firewallRule);
}
else
firewallPolicy.Rules.Remove(nameRule);
-
}
protected static void BlockSpyDomain(in bool isChoose)
{
- try
- {
- if (CheckRulesWindows(NameRules["Domain"]) && isChoose)
- RulesHosts(isChoose);
- else
- {
- try { RulesHosts(isChoose); } catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
- }
- }
+ try { RulesHosts(isChoose); }
catch { new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]); }
}
@@ -167,7 +142,8 @@ namespace GTweak.Utilities.Tweaks
if (isChoose)
{
- firewallPolicy.Rules.Remove(NameRules["Domain"]);
+ if (CheckRulesWindows(NameRules["Domain"]))
+ firewallPolicy.Rules.Remove(NameRules["Domain"]);
firewallPolicy.Rules.Add(firewallRule);
}
else
@@ -176,21 +152,7 @@ namespace GTweak.Utilities.Tweaks
protected static void BlockWDefender(bool isChoose)
{
- try
- {
- if (CheckRulesWindows(NameRules["WDefender"]) && isChoose)
- {
- Parallel.Invoke(() => { AddRulesOut(isChoose, PathsForPrograms["WD"], NameRules["WDefender"], "blocking Windows Defender database updates"); });
- }
- else
- {
- Parallel.Invoke(() =>
- {
- try { AddRulesOut(isChoose, PathsForPrograms["WD"], NameRules["WDefender"], "blocking Windows Defender database updates"); }
- catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
- });
- }
- }
+ try { Parallel.Invoke(() => { ChangeRulesOut(isChoose, PathsForPrograms["WD"], NameRules["WDefender"], "blocking Windows Defender database updates"); }); }
catch { new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]); }
}
}
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
index 591aa462..470bf289 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
@@ -127,17 +127,17 @@ namespace GTweak.Utilities.Tweaks
systemV.TglButton8.StateNA = Registry.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SecurityHealthService", "Start", null) == null ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SecurityHealthService", "Start", string.Empty).ToString() != "4" ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Features", "TamperProtection", null) == null ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Features", "TamperProtection", string.Empty).ToString() != "0" ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\App and Browser protection", "DisallowExploitProtectionOverride", null) == null ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\App and Browser protection", "DisallowExploitProtectionOverride", string.Empty).ToString() != "0" ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\App and Browser protection", "UILockdown", null) == null ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\App and Browser protection", "UILockdown", string.Empty).ToString() != "1" ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Real-Time Protection", "DisableBehaviorMonitoring", null) == null ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Real-Time Protection", "DisableBehaviorMonitoring", string.Empty).ToString() != "1" ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Real-Time Protection", "DisableRealtimeMonitoring", null) == null ||
- Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Real-Time Protection", "DisableRealtimeMonitoring", string.Empty).ToString() != "1"; ;
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SecurityHealthService", "Start", string.Empty).ToString() != "4" ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Features", "TamperProtection", null) == null ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Features", "TamperProtection", string.Empty).ToString() != "0" ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\App and Browser protection", "DisallowExploitProtectionOverride", null) == null ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\App and Browser protection", "DisallowExploitProtectionOverride", string.Empty).ToString() != "0" ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\App and Browser protection", "UILockdown", null) == null ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender Security Center\App and Browser protection", "UILockdown", string.Empty).ToString() != "1" ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Real-Time Protection", "DisableBehaviorMonitoring", null) == null ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Real-Time Protection", "DisableBehaviorMonitoring", string.Empty).ToString() != "1" ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Real-Time Protection", "DisableRealtimeMonitoring", null) == null ||
+ Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Real-Time Protection", "DisableRealtimeMonitoring", string.Empty).ToString() != "1"; ;
diff --git a/.Source/GTweak/Utilities/Tweaks/UninstallingApps.cs b/.Source/GTweak/Utilities/Tweaks/UninstallingApps.cs
index 8b150cfe..5cb73d47 100644
--- a/.Source/GTweak/Utilities/Tweaks/UninstallingApps.cs
+++ b/.Source/GTweak/Utilities/Tweaks/UninstallingApps.cs
@@ -10,7 +10,7 @@ namespace GTweak.Utilities.Tweaks
{
internal sealed class UninstallingApps
{
- internal static string UserAppsList { get; private set; } = string.Empty;
+ internal static string UserPackages { get; private set; } = string.Empty;
internal static bool IsOneDriveInstalled => File.Exists(Environment.ExpandEnvironmentVariables(@"%userprofile%\AppData\Local\Microsoft\OneDrive\OneDrive.exe"));
private static bool isLocalAccount = false;
@@ -115,7 +115,7 @@ namespace GTweak.Utilities.Tweaks
["Widgets"] = "Windows.Client.WebExperience"
};
- internal void ViewInstalledApp()
+ internal void ViewInstalledPackages()
{
ProcessStartInfo startInfo = new ProcessStartInfo
{
@@ -131,7 +131,7 @@ namespace GTweak.Utilities.Tweaks
process.Start();
- UserAppsList = process.StandardOutput.ReadToEnd();
+ UserPackages = process.StandardOutput.ReadToEnd();
process.Close();
process.Dispose();
@@ -167,12 +167,12 @@ namespace GTweak.Utilities.Tweaks
{
process.StartInfo.Arguments = "Get-AppxProvisionedPackage -online | where-object {$_.PackageName -like '*" + AlternativeName[packageName] + "*'} | Remove-AppxProvisionedPackage -alluser -online –Verbose";
process.Start();
- UserAppsList = UserAppsList.Replace(AlternativeName[packageName], "");
+ UserPackages = UserPackages.Replace(AlternativeName[packageName], "");
}
process.WaitForExit(1000);
- UserAppsList = UserAppsList.Replace(packageName, string.Empty);
+ UserPackages = UserPackages.Replace(packageName, string.Empty);
await Task.Delay(8000);
IsAppUnavailable[packageName] = false;
@@ -226,7 +226,8 @@ namespace GTweak.Utilities.Tweaks
IsAppUnavailable["OneDrive"] = false;
}
- string argumentsFolders = @"/c rd /s /q %userprofile%\AppData\Local\Microsoft\OneDrive & rd /s /q ""%allusersprofile%\Microsoft OneDrive"" & rd /s /q " + Settings.PathSystemDisk + @"\OneDriveTemp";
+ string argumentsFolders = @"/c rd /s /q %userprofile%\AppData\Local\Microsoft\OneDrive & rd /s /q %userprofile%\AppData\Local\OneDrive
+ & rd /s /q ""%allusersprofile%\Microsoft OneDrive"" & rd /s /q " + Settings.PathSystemDisk + @"\OneDriveTemp";
if (isLocalAccount)
argumentsFolders += @" & rd /s /q %userprofile%\OneDrive";
diff --git a/.Source/GTweak/View/ApplicationsView.xaml.cs b/.Source/GTweak/View/ApplicationsView.xaml.cs
index 2f018844..ecd5769d 100644
--- a/.Source/GTweak/View/ApplicationsView.xaml.cs
+++ b/.Source/GTweak/View/ApplicationsView.xaml.cs
@@ -30,7 +30,7 @@ namespace GTweak.View
else if (time.TotalSeconds % 5 == 0)
{
BackgroundWorker backgroundWorker = new BackgroundWorker();
- backgroundWorker.DoWork += delegate { new UninstallingApps().ViewInstalledApp(); };
+ backgroundWorker.DoWork += delegate { new UninstallingApps().ViewInstalledPackages(); };
backgroundWorker.RunWorkerAsync();
}
@@ -97,48 +97,48 @@ namespace GTweak.View
private void UpdateViewStateApps()
{
- MicrosoftStore.Source = !UninstallingApps.IsAppUnavailable["MicrosoftStore"] ? UninstallingApps.UserAppsList.Contains("Microsoft.WindowsStore") ? (DrawingImage)FindResource("A_DI_MicrosoftStore") : (DrawingImage)FindResource("DA_DI_MicrosoftStore") : (DrawingImage)FindResource("DI_Sandtime");
- Todos.Source = !UninstallingApps.IsAppUnavailable["Todos"] ? UninstallingApps.UserAppsList.Contains("Microsoft.Todos") ? (DrawingImage)FindResource("A_DI_Todos") : (DrawingImage)FindResource("DA_DI_Todos") : (DrawingImage)FindResource("DI_Sandtime");
- BingWeather.Source = !UninstallingApps.IsAppUnavailable["BingWeather"] ? UninstallingApps.UserAppsList.Contains("Microsoft.BingWeather") ? (DrawingImage)FindResource("A_DI_BingWeather") : (DrawingImage)FindResource("DA_DI_BingWeather") : (DrawingImage)FindResource("DI_Sandtime");
- Microsoft3D.Source = !UninstallingApps.IsAppUnavailable["Microsoft3D"] ? UninstallingApps.UserAppsList.Contains("Microsoft.Microsoft3DViewer") ? (DrawingImage)FindResource("A_DI_Microsoft3D") : (DrawingImage)FindResource("DA_DI_Microsoft3D") : (DrawingImage)FindResource("DI_Sandtime");
- Music.Source = !UninstallingApps.IsAppUnavailable["Music"] ? UninstallingApps.UserAppsList.Contains("Microsoft.ZuneMusic") ? (DrawingImage)FindResource("A_DI_Music") : (DrawingImage)FindResource("DA_DI_Music") : (DrawingImage)FindResource("DI_Sandtime");
- GetHelp.Source = !UninstallingApps.IsAppUnavailable["GetHelp"] ? UninstallingApps.UserAppsList.Contains("Microsoft.GetHelp") ? (DrawingImage)FindResource("A_DI_GetHelp") : (DrawingImage)FindResource("DA_DI_GetHelp") : (DrawingImage)FindResource("DI_Sandtime");
- MicrosoftOfficeHub.Source = !UninstallingApps.IsAppUnavailable["MicrosoftOfficeHub"] ? UninstallingApps.UserAppsList.Contains("Microsoft.MicrosoftOfficeHub") ? (DrawingImage)FindResource("A_DI_MicrosoftOfficeHub") : (DrawingImage)FindResource("DA_DI_MicrosoftOfficeHub") : (DrawingImage)FindResource("DI_Sandtime");
- MicrosoftSolitaireCollection.Source = !UninstallingApps.IsAppUnavailable["MicrosoftSolitaireCollection"] ? UninstallingApps.UserAppsList.Contains("Microsoft.MicrosoftSolitaireCollection") ? (DrawingImage)FindResource("A_DI_MicrosoftSolitaireCollection") : (DrawingImage)FindResource("DA_DI_MicrosoftSolitaireCollection") : (DrawingImage)FindResource("DI_Sandtime"); MixedReality.Source = !UninstallingApps.IsAppUnavailable["MixedReality"] ? UninstallingApps.UserAppsList.Contains("Microsoft.MixedReality.Portal") ? (DrawingImage)FindResource("A_DI_MixedReality") : (DrawingImage)FindResource("DA_DI_MixedReality") : (DrawingImage)FindResource("DI_Sandtime");
- Xbox.Source = !UninstallingApps.IsAppUnavailable["Xbox"] ? UninstallingApps.UserAppsList.Contains("Microsoft.XboxApp") || UninstallingApps.UserAppsList.Contains("Microsoft.GamingApp") || UninstallingApps.UserAppsList.Contains("Microsoft.XboxGamingOverlay") ||
- UninstallingApps.UserAppsList.Contains("Microsoft.XboxGameOverlay") || UninstallingApps.UserAppsList.Contains("Microsoft.XboxIdentityProvider") || UninstallingApps.UserAppsList.Contains("Microsoft.Xbox.TCUI") ||
- UninstallingApps.UserAppsList.Contains("Microsoft.XboxSpeechToTextOverlay") ? (DrawingImage)FindResource("A_DI_Xbox") : (DrawingImage)FindResource("DA_DI_Xbox") : (DrawingImage)FindResource("DI_Sandtime");
- Paint3D.Source = !UninstallingApps.IsAppUnavailable["Paint3D"] ? UninstallingApps.UserAppsList.Contains("Microsoft.MSPaint") ? (DrawingImage)FindResource("A_DI_Paint3D") : (DrawingImage)FindResource("DA_DI_Paint3D") : (DrawingImage)FindResource("DI_Sandtime");
- OneNote.Source = !UninstallingApps.IsAppUnavailable["OneNote"] ? UninstallingApps.UserAppsList.Contains("Microsoft.Office.OneNote") ? (DrawingImage)FindResource("A_DI_OneNote") : (DrawingImage)FindResource("DA_DI_OneNote") : (DrawingImage)FindResource("DI_Sandtime");
- People.Source = !UninstallingApps.IsAppUnavailable["People"] ? UninstallingApps.UserAppsList.Contains("Microsoft.People") ? (DrawingImage)FindResource("A_DI_People") : (DrawingImage)FindResource("DA_DI_People") : (DrawingImage)FindResource("DI_Sandtime");
- MicrosoftStickyNotes.Source = !UninstallingApps.IsAppUnavailable["MicrosoftStickyNotes"] ? UninstallingApps.UserAppsList.Contains("Microsoft.MicrosoftStickyNotes") ? (DrawingImage)FindResource("A_DI_MicrosoftStickyNotes") : (DrawingImage)FindResource("DA_DI_MicrosoftStickyNotes") : (DrawingImage)FindResource("DI_Sandtime");
- Widgets.Source = !UninstallingApps.IsAppUnavailable["Widgets"] ? UninstallingApps.UserAppsList.Contains("MicrosoftWindows.Client.WebExperience") ? (DrawingImage)FindResource("A_DI_Widgets") : (DrawingImage)FindResource("DA_DI_Widgets") : (DrawingImage)FindResource("DI_Sandtime");
- ScreenSketch.Source = !UninstallingApps.IsAppUnavailable["ScreenSketch"] ? UninstallingApps.UserAppsList.Contains("Microsoft.ScreenSketch") ? (DrawingImage)FindResource("A_DI_ScreenSketch") : (DrawingImage)FindResource("DA_DI_ScreenSketch") : (DrawingImage)FindResource("DI_Sandtime");
- Phone.Source = !UninstallingApps.IsAppUnavailable["Phone"] ? UninstallingApps.UserAppsList.Contains("Microsoft.YourPhone") ? (DrawingImage)FindResource("A_DI_Phone") : (DrawingImage)FindResource("DA_DI_Phone") : (DrawingImage)FindResource("DI_Sandtime");
- Photos.Source = !UninstallingApps.IsAppUnavailable["Photos"] ? UninstallingApps.UserAppsList.Contains("Microsoft.Windows.Photos") ? (DrawingImage)FindResource("A_DI_Photos") : (DrawingImage)FindResource("DA_DI_Photos") : (DrawingImage)FindResource("DI_Sandtime");
- FeedbackHub.Source = !UninstallingApps.IsAppUnavailable["FeedbackHub"] ? UninstallingApps.UserAppsList.Contains("Microsoft.WindowsFeedbackHub") ? (DrawingImage)FindResource("A_DI_FeedbackHub") : (DrawingImage)FindResource("DA_DI_FeedbackHub") : (DrawingImage)FindResource("DI_Sandtime");
- SoundRecorder.Source = !UninstallingApps.IsAppUnavailable["SoundRecorder"] ? UninstallingApps.UserAppsList.Contains("Microsoft.WindowsSoundRecorder") ? (DrawingImage)FindResource("A_DI_SoundRecorder") : (DrawingImage)FindResource("DA_DI_SoundRecorder") : (DrawingImage)FindResource("DI_Sandtime");
- Alarms.Source = !UninstallingApps.IsAppUnavailable["Alarms"] ? UninstallingApps.UserAppsList.Contains("Microsoft.WindowsAlarms") ? (DrawingImage)FindResource("A_DI_Alarms") : (DrawingImage)FindResource("DA_DI_Alarms") : (DrawingImage)FindResource("DI_Sandtime");
- SkypeApp.Source = !UninstallingApps.IsAppUnavailable["SkypeApp"] ? UninstallingApps.UserAppsList.Contains("Microsoft.SkypeApp") ? (DrawingImage)FindResource("A_DI_SkypeApp") : (DrawingImage)FindResource("DA_DI_SkypeApp") : (DrawingImage)FindResource("DI_Sandtime");
- Maps.Source = !UninstallingApps.IsAppUnavailable["Maps"] ? UninstallingApps.UserAppsList.Contains("Microsoft.WindowsMaps") ? (DrawingImage)FindResource("A_DI_Maps") : (DrawingImage)FindResource("DA_DI_Maps") : (DrawingImage)FindResource("DI_Sandtime");
- Camera.Source = !UninstallingApps.IsAppUnavailable["Camera"] ? UninstallingApps.UserAppsList.Contains("Microsoft.WindowsCamera") ? (DrawingImage)FindResource("A_DI_Camera") : (DrawingImage)FindResource("DA_DI_Camera") : (DrawingImage)FindResource("DI_Sandtime");
- Video.Source = !UninstallingApps.IsAppUnavailable["Video"] ? UninstallingApps.UserAppsList.Contains("Microsoft.ZuneVideo") ? (DrawingImage)FindResource("A_DI_Video") : (DrawingImage)FindResource("DA_DI_Video") : (DrawingImage)FindResource("DI_Sandtime");
- BingNews.Source = !UninstallingApps.IsAppUnavailable["BingNews"] ? UninstallingApps.UserAppsList.Contains("Microsoft.BingNews") ? (DrawingImage)FindResource("A_DI_BingNews") : (DrawingImage)FindResource("DA_DI_BingNews") : (DrawingImage)FindResource("DI_Sandtime");
- Mail.Source = !UninstallingApps.IsAppUnavailable["Mail"] ? UninstallingApps.UserAppsList.Contains("microsoft.windowscommunicationsapps") ? (DrawingImage)FindResource("A_DI_Mail") : (DrawingImage)FindResource("DA_DI_Mail") : (DrawingImage)FindResource("DI_Sandtime");
- MicrosoftTeams.Source = !UninstallingApps.IsAppUnavailable["MicrosoftTeams"] ? UninstallingApps.UserAppsList.Contains("MicrosoftTeams") || UninstallingApps.UserAppsList.Contains("MSTeams") ? (DrawingImage)FindResource("A_DI_MicrosoftTeams") : (DrawingImage)FindResource("DA_DI_MicrosoftTeams") : (DrawingImage)FindResource("DI_Sandtime");
- PowerAutomateDesktop.Source = !UninstallingApps.IsAppUnavailable["PowerAutomateDesktop"] ? UninstallingApps.UserAppsList.Contains("Microsoft.PowerAutomateDesktop") ? (DrawingImage)FindResource("A_DI_PowerAutomateDesktop") : (DrawingImage)FindResource("DA_DI_PowerAutomateDesktop") : (DrawingImage)FindResource("DI_Sandtime");
- Cortana.Source = !UninstallingApps.IsAppUnavailable["Cortana"] ? UninstallingApps.UserAppsList.Contains("Microsoft.549981C3F5F10") ? (DrawingImage)FindResource("A_DI_Cortana") : (DrawingImage)FindResource("DA_DI_Cortana") : (DrawingImage)FindResource("DI_Sandtime");
- ClipChamp.Source = !UninstallingApps.IsAppUnavailable["ClipChamp"] ? UninstallingApps.UserAppsList.Contains("Clipchamp.Clipchamp") ? (DrawingImage)FindResource("A_DI_ClipChamp") : (DrawingImage)FindResource("DA_DI_ClipChamp") : (DrawingImage)FindResource("DI_Sandtime");
- GetStarted.Source = !UninstallingApps.IsAppUnavailable["GetStarted"] ? UninstallingApps.UserAppsList.Contains("Microsoft.Getstarted") ? (DrawingImage)FindResource("A_DI_GetStarted") : (DrawingImage)FindResource("DA_DI_GetStarted") : (DrawingImage)FindResource("DI_Sandtime");
+ MicrosoftStore.Source = !UninstallingApps.IsAppUnavailable["MicrosoftStore"] ? UninstallingApps.UserPackages.Contains("Microsoft.WindowsStore") ? (DrawingImage)FindResource("A_DI_MicrosoftStore") : (DrawingImage)FindResource("DA_DI_MicrosoftStore") : (DrawingImage)FindResource("DI_Sandtime");
+ Todos.Source = !UninstallingApps.IsAppUnavailable["Todos"] ? UninstallingApps.UserPackages.Contains("Microsoft.Todos") ? (DrawingImage)FindResource("A_DI_Todos") : (DrawingImage)FindResource("DA_DI_Todos") : (DrawingImage)FindResource("DI_Sandtime");
+ BingWeather.Source = !UninstallingApps.IsAppUnavailable["BingWeather"] ? UninstallingApps.UserPackages.Contains("Microsoft.BingWeather") ? (DrawingImage)FindResource("A_DI_BingWeather") : (DrawingImage)FindResource("DA_DI_BingWeather") : (DrawingImage)FindResource("DI_Sandtime");
+ Microsoft3D.Source = !UninstallingApps.IsAppUnavailable["Microsoft3D"] ? UninstallingApps.UserPackages.Contains("Microsoft.Microsoft3DViewer") ? (DrawingImage)FindResource("A_DI_Microsoft3D") : (DrawingImage)FindResource("DA_DI_Microsoft3D") : (DrawingImage)FindResource("DI_Sandtime");
+ Music.Source = !UninstallingApps.IsAppUnavailable["Music"] ? UninstallingApps.UserPackages.Contains("Microsoft.ZuneMusic") ? (DrawingImage)FindResource("A_DI_Music") : (DrawingImage)FindResource("DA_DI_Music") : (DrawingImage)FindResource("DI_Sandtime");
+ GetHelp.Source = !UninstallingApps.IsAppUnavailable["GetHelp"] ? UninstallingApps.UserPackages.Contains("Microsoft.GetHelp") ? (DrawingImage)FindResource("A_DI_GetHelp") : (DrawingImage)FindResource("DA_DI_GetHelp") : (DrawingImage)FindResource("DI_Sandtime");
+ MicrosoftOfficeHub.Source = !UninstallingApps.IsAppUnavailable["MicrosoftOfficeHub"] ? UninstallingApps.UserPackages.Contains("Microsoft.MicrosoftOfficeHub") ? (DrawingImage)FindResource("A_DI_MicrosoftOfficeHub") : (DrawingImage)FindResource("DA_DI_MicrosoftOfficeHub") : (DrawingImage)FindResource("DI_Sandtime");
+ MicrosoftSolitaireCollection.Source = !UninstallingApps.IsAppUnavailable["MicrosoftSolitaireCollection"] ? UninstallingApps.UserPackages.Contains("Microsoft.MicrosoftSolitaireCollection") ? (DrawingImage)FindResource("A_DI_MicrosoftSolitaireCollection") : (DrawingImage)FindResource("DA_DI_MicrosoftSolitaireCollection") : (DrawingImage)FindResource("DI_Sandtime"); MixedReality.Source = !UninstallingApps.IsAppUnavailable["MixedReality"] ? UninstallingApps.UserPackages.Contains("Microsoft.MixedReality.Portal") ? (DrawingImage)FindResource("A_DI_MixedReality") : (DrawingImage)FindResource("DA_DI_MixedReality") : (DrawingImage)FindResource("DI_Sandtime");
+ Xbox.Source = !UninstallingApps.IsAppUnavailable["Xbox"] ? UninstallingApps.UserPackages.Contains("Microsoft.XboxApp") || UninstallingApps.UserPackages.Contains("Microsoft.GamingApp") || UninstallingApps.UserPackages.Contains("Microsoft.XboxGamingOverlay") ||
+ UninstallingApps.UserPackages.Contains("Microsoft.XboxGameOverlay") || UninstallingApps.UserPackages.Contains("Microsoft.XboxIdentityProvider") || UninstallingApps.UserPackages.Contains("Microsoft.Xbox.TCUI") ||
+ UninstallingApps.UserPackages.Contains("Microsoft.XboxSpeechToTextOverlay") ? (DrawingImage)FindResource("A_DI_Xbox") : (DrawingImage)FindResource("DA_DI_Xbox") : (DrawingImage)FindResource("DI_Sandtime");
+ Paint3D.Source = !UninstallingApps.IsAppUnavailable["Paint3D"] ? UninstallingApps.UserPackages.Contains("Microsoft.MSPaint") ? (DrawingImage)FindResource("A_DI_Paint3D") : (DrawingImage)FindResource("DA_DI_Paint3D") : (DrawingImage)FindResource("DI_Sandtime");
+ OneNote.Source = !UninstallingApps.IsAppUnavailable["OneNote"] ? UninstallingApps.UserPackages.Contains("Microsoft.Office.OneNote") ? (DrawingImage)FindResource("A_DI_OneNote") : (DrawingImage)FindResource("DA_DI_OneNote") : (DrawingImage)FindResource("DI_Sandtime");
+ People.Source = !UninstallingApps.IsAppUnavailable["People"] ? UninstallingApps.UserPackages.Contains("Microsoft.People") ? (DrawingImage)FindResource("A_DI_People") : (DrawingImage)FindResource("DA_DI_People") : (DrawingImage)FindResource("DI_Sandtime");
+ MicrosoftStickyNotes.Source = !UninstallingApps.IsAppUnavailable["MicrosoftStickyNotes"] ? UninstallingApps.UserPackages.Contains("Microsoft.MicrosoftStickyNotes") ? (DrawingImage)FindResource("A_DI_MicrosoftStickyNotes") : (DrawingImage)FindResource("DA_DI_MicrosoftStickyNotes") : (DrawingImage)FindResource("DI_Sandtime");
+ Widgets.Source = !UninstallingApps.IsAppUnavailable["Widgets"] ? UninstallingApps.UserPackages.Contains("MicrosoftWindows.Client.WebExperience") ? (DrawingImage)FindResource("A_DI_Widgets") : (DrawingImage)FindResource("DA_DI_Widgets") : (DrawingImage)FindResource("DI_Sandtime");
+ ScreenSketch.Source = !UninstallingApps.IsAppUnavailable["ScreenSketch"] ? UninstallingApps.UserPackages.Contains("Microsoft.ScreenSketch") ? (DrawingImage)FindResource("A_DI_ScreenSketch") : (DrawingImage)FindResource("DA_DI_ScreenSketch") : (DrawingImage)FindResource("DI_Sandtime");
+ Phone.Source = !UninstallingApps.IsAppUnavailable["Phone"] ? UninstallingApps.UserPackages.Contains("Microsoft.YourPhone") ? (DrawingImage)FindResource("A_DI_Phone") : (DrawingImage)FindResource("DA_DI_Phone") : (DrawingImage)FindResource("DI_Sandtime");
+ Photos.Source = !UninstallingApps.IsAppUnavailable["Photos"] ? UninstallingApps.UserPackages.Contains("Microsoft.Windows.Photos") ? (DrawingImage)FindResource("A_DI_Photos") : (DrawingImage)FindResource("DA_DI_Photos") : (DrawingImage)FindResource("DI_Sandtime");
+ FeedbackHub.Source = !UninstallingApps.IsAppUnavailable["FeedbackHub"] ? UninstallingApps.UserPackages.Contains("Microsoft.WindowsFeedbackHub") ? (DrawingImage)FindResource("A_DI_FeedbackHub") : (DrawingImage)FindResource("DA_DI_FeedbackHub") : (DrawingImage)FindResource("DI_Sandtime");
+ SoundRecorder.Source = !UninstallingApps.IsAppUnavailable["SoundRecorder"] ? UninstallingApps.UserPackages.Contains("Microsoft.WindowsSoundRecorder") ? (DrawingImage)FindResource("A_DI_SoundRecorder") : (DrawingImage)FindResource("DA_DI_SoundRecorder") : (DrawingImage)FindResource("DI_Sandtime");
+ Alarms.Source = !UninstallingApps.IsAppUnavailable["Alarms"] ? UninstallingApps.UserPackages.Contains("Microsoft.WindowsAlarms") ? (DrawingImage)FindResource("A_DI_Alarms") : (DrawingImage)FindResource("DA_DI_Alarms") : (DrawingImage)FindResource("DI_Sandtime");
+ SkypeApp.Source = !UninstallingApps.IsAppUnavailable["SkypeApp"] ? UninstallingApps.UserPackages.Contains("Microsoft.SkypeApp") ? (DrawingImage)FindResource("A_DI_SkypeApp") : (DrawingImage)FindResource("DA_DI_SkypeApp") : (DrawingImage)FindResource("DI_Sandtime");
+ Maps.Source = !UninstallingApps.IsAppUnavailable["Maps"] ? UninstallingApps.UserPackages.Contains("Microsoft.WindowsMaps") ? (DrawingImage)FindResource("A_DI_Maps") : (DrawingImage)FindResource("DA_DI_Maps") : (DrawingImage)FindResource("DI_Sandtime");
+ Camera.Source = !UninstallingApps.IsAppUnavailable["Camera"] ? UninstallingApps.UserPackages.Contains("Microsoft.WindowsCamera") ? (DrawingImage)FindResource("A_DI_Camera") : (DrawingImage)FindResource("DA_DI_Camera") : (DrawingImage)FindResource("DI_Sandtime");
+ Video.Source = !UninstallingApps.IsAppUnavailable["Video"] ? UninstallingApps.UserPackages.Contains("Microsoft.ZuneVideo") ? (DrawingImage)FindResource("A_DI_Video") : (DrawingImage)FindResource("DA_DI_Video") : (DrawingImage)FindResource("DI_Sandtime");
+ BingNews.Source = !UninstallingApps.IsAppUnavailable["BingNews"] ? UninstallingApps.UserPackages.Contains("Microsoft.BingNews") ? (DrawingImage)FindResource("A_DI_BingNews") : (DrawingImage)FindResource("DA_DI_BingNews") : (DrawingImage)FindResource("DI_Sandtime");
+ Mail.Source = !UninstallingApps.IsAppUnavailable["Mail"] ? UninstallingApps.UserPackages.Contains("microsoft.windowscommunicationsapps") ? (DrawingImage)FindResource("A_DI_Mail") : (DrawingImage)FindResource("DA_DI_Mail") : (DrawingImage)FindResource("DI_Sandtime");
+ MicrosoftTeams.Source = !UninstallingApps.IsAppUnavailable["MicrosoftTeams"] ? UninstallingApps.UserPackages.Contains("MicrosoftTeams") || UninstallingApps.UserPackages.Contains("MSTeams") ? (DrawingImage)FindResource("A_DI_MicrosoftTeams") : (DrawingImage)FindResource("DA_DI_MicrosoftTeams") : (DrawingImage)FindResource("DI_Sandtime");
+ PowerAutomateDesktop.Source = !UninstallingApps.IsAppUnavailable["PowerAutomateDesktop"] ? UninstallingApps.UserPackages.Contains("Microsoft.PowerAutomateDesktop") ? (DrawingImage)FindResource("A_DI_PowerAutomateDesktop") : (DrawingImage)FindResource("DA_DI_PowerAutomateDesktop") : (DrawingImage)FindResource("DI_Sandtime");
+ Cortana.Source = !UninstallingApps.IsAppUnavailable["Cortana"] ? UninstallingApps.UserPackages.Contains("Microsoft.549981C3F5F10") ? (DrawingImage)FindResource("A_DI_Cortana") : (DrawingImage)FindResource("DA_DI_Cortana") : (DrawingImage)FindResource("DI_Sandtime");
+ ClipChamp.Source = !UninstallingApps.IsAppUnavailable["ClipChamp"] ? UninstallingApps.UserPackages.Contains("Clipchamp.Clipchamp") ? (DrawingImage)FindResource("A_DI_ClipChamp") : (DrawingImage)FindResource("DA_DI_ClipChamp") : (DrawingImage)FindResource("DI_Sandtime");
+ GetStarted.Source = !UninstallingApps.IsAppUnavailable["GetStarted"] ? UninstallingApps.UserPackages.Contains("Microsoft.Getstarted") ? (DrawingImage)FindResource("A_DI_GetStarted") : (DrawingImage)FindResource("DA_DI_GetStarted") : (DrawingImage)FindResource("DI_Sandtime");
OneDrive.Source = !UninstallingApps.IsAppUnavailable["OneDrive"] ? UninstallingApps.IsOneDriveInstalled ? (DrawingImage)FindResource("A_DI_OneDrive") : (DrawingImage)FindResource("DA_DI_OneDrive") : (DrawingImage)FindResource("DI_Sandtime");
- BingSports.Source = !UninstallingApps.IsAppUnavailable["BingSports"] ? UninstallingApps.UserAppsList.Contains("Microsoft.BingSports") ? (DrawingImage)FindResource("A_DI_BingSports") : (DrawingImage)FindResource("DA_DI_BingSports") : (DrawingImage)FindResource("DI_Sandtime");
- BingFinance.Source = !UninstallingApps.IsAppUnavailable["BingFinance"] ? UninstallingApps.UserAppsList.Contains("Microsoft.BingFinance") ? (DrawingImage)FindResource("A_DI_BingFinance") : (DrawingImage)FindResource("DA_DI_BingFinance") : (DrawingImage)FindResource("DI_Sandtime");
- MicrosoftFamily.Source = !UninstallingApps.IsAppUnavailable["MicrosoftFamily"] ? UninstallingApps.UserAppsList.Contains("MicrosoftFamily") ? (DrawingImage)FindResource("A_DI_MicrosoftFamily") : (DrawingImage)FindResource("DA_DI_MicrosoftFamily") : (DrawingImage)FindResource("DI_Sandtime");
- BingSearch.Source = !UninstallingApps.IsAppUnavailable["BingSearch"] ? UninstallingApps.UserAppsList.Contains("BingSearch") ? (DrawingImage)FindResource("A_DI_BingSearch") : (DrawingImage)FindResource("DA_DI_BingSearch") : (DrawingImage)FindResource("DI_Sandtime");
- Outlook.Source = !UninstallingApps.IsAppUnavailable["Outlook"] ? UninstallingApps.UserAppsList.Contains("Microsoft.OutlookForWindows") ? (DrawingImage)FindResource("A_DI_Outlook") : (DrawingImage)FindResource("DA_DI_Outlook") : (DrawingImage)FindResource("DI_Sandtime");
- QuickAssist.Source = !UninstallingApps.IsAppUnavailable["QuickAssist"] ? UninstallingApps.UserAppsList.Contains("MicrosoftCorporationII.QuickAssist") ? (DrawingImage)FindResource("A_DI_QuickAssist") : (DrawingImage)FindResource("DA_DI_QuickAssist") : (DrawingImage)FindResource("DI_Sandtime");
- DevHome.Source = !UninstallingApps.IsAppUnavailable["DevHome"] ? UninstallingApps.UserAppsList.Contains("DevHome") ? (DrawingImage)FindResource("A_DI_DevHome") : (DrawingImage)FindResource("DA_DI_DevHome") : (DrawingImage)FindResource("DI_Sandtime");
- WindowsTerminal.Source = !UninstallingApps.IsAppUnavailable["WindowsTerminal"] ? UninstallingApps.UserAppsList.Contains("WindowsTerminal") ? (DrawingImage)FindResource("A_DI_WindowsTerminal") : (DrawingImage)FindResource("DA_DI_WindowsTerminal") : (DrawingImage)FindResource("DI_Sandtime");
+ BingSports.Source = !UninstallingApps.IsAppUnavailable["BingSports"] ? UninstallingApps.UserPackages.Contains("Microsoft.BingSports") ? (DrawingImage)FindResource("A_DI_BingSports") : (DrawingImage)FindResource("DA_DI_BingSports") : (DrawingImage)FindResource("DI_Sandtime");
+ BingFinance.Source = !UninstallingApps.IsAppUnavailable["BingFinance"] ? UninstallingApps.UserPackages.Contains("Microsoft.BingFinance") ? (DrawingImage)FindResource("A_DI_BingFinance") : (DrawingImage)FindResource("DA_DI_BingFinance") : (DrawingImage)FindResource("DI_Sandtime");
+ MicrosoftFamily.Source = !UninstallingApps.IsAppUnavailable["MicrosoftFamily"] ? UninstallingApps.UserPackages.Contains("MicrosoftFamily") ? (DrawingImage)FindResource("A_DI_MicrosoftFamily") : (DrawingImage)FindResource("DA_DI_MicrosoftFamily") : (DrawingImage)FindResource("DI_Sandtime");
+ BingSearch.Source = !UninstallingApps.IsAppUnavailable["BingSearch"] ? UninstallingApps.UserPackages.Contains("BingSearch") ? (DrawingImage)FindResource("A_DI_BingSearch") : (DrawingImage)FindResource("DA_DI_BingSearch") : (DrawingImage)FindResource("DI_Sandtime");
+ Outlook.Source = !UninstallingApps.IsAppUnavailable["Outlook"] ? UninstallingApps.UserPackages.Contains("Microsoft.OutlookForWindows") ? (DrawingImage)FindResource("A_DI_Outlook") : (DrawingImage)FindResource("DA_DI_Outlook") : (DrawingImage)FindResource("DI_Sandtime");
+ QuickAssist.Source = !UninstallingApps.IsAppUnavailable["QuickAssist"] ? UninstallingApps.UserPackages.Contains("MicrosoftCorporationII.QuickAssist") ? (DrawingImage)FindResource("A_DI_QuickAssist") : (DrawingImage)FindResource("DA_DI_QuickAssist") : (DrawingImage)FindResource("DI_Sandtime");
+ DevHome.Source = !UninstallingApps.IsAppUnavailable["DevHome"] ? UninstallingApps.UserPackages.Contains("DevHome") ? (DrawingImage)FindResource("A_DI_DevHome") : (DrawingImage)FindResource("DA_DI_DevHome") : (DrawingImage)FindResource("DI_Sandtime");
+ WindowsTerminal.Source = !UninstallingApps.IsAppUnavailable["WindowsTerminal"] ? UninstallingApps.UserPackages.Contains("WindowsTerminal") ? (DrawingImage)FindResource("A_DI_WindowsTerminal") : (DrawingImage)FindResource("DA_DI_WindowsTerminal") : (DrawingImage)FindResource("DI_Sandtime");
}
}
}
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index c9102c0c..01a3ec94 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -54,7 +54,7 @@ namespace GTweak.Windows
new WindowsLicense().LicenseStatus,
new SystemData.СomputerСonfiguration().GetСonfigurationComputer,
new SystemData.UtilityСonfiguration().CheckingUpdate,
- new UninstallingApps().ViewInstalledApp,
+ new UninstallingApps().ViewInstalledPackages,
new UninstallingApps().CheckingForLocalAccount,
new SystemTweaks().ViewNetshState,
new SystemTweaks().ViewTaskState,