Skip to content

Portable Tool for an Ideal Windows Setup

-changed & fixed

Greedeks69105b2feb0c
diff --git a/.Source/GTweak/Utilities/Helpers/BackgroundQueue.cs b/.Source/GTweak/Utilities/Helpers/BackgroundQueue.cs
index 2d4715c5..67914d71 100644
--- a/.Source/GTweak/Utilities/Helpers/BackgroundQueue.cs
+++ b/.Source/GTweak/Utilities/Helpers/BackgroundQueue.cs
@@ -32,6 +32,12 @@ namespace GTweak.Utilities.Helpers
return task;
}
}
- internal bool IsQueueCompleted => previousTask.IsCompleted;
+
+ internal void QueueCompleted(Action action)
+ {
+ if (previousTask.IsCompleted)
+ action();
+ }
}
}
+
diff --git a/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs b/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
index e416aa82..4877c324 100644
--- a/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
@@ -222,12 +222,11 @@ namespace GTweak.Utilities.Tweaks
{
BackgroundQueue backgroundQueue = new BackgroundQueue();
await backgroundQueue.QueueTask(delegate { ClearFileSystemCache(true); EmptyWorkingSetFunction(); ClearTempSystemCache(); });
-
- if (backgroundQueue.IsQueueCompleted)
+ backgroundQueue.QueueCompleted(async delegate
{
await Task.Delay(1000);
new ViewNotification().Show("", "info", (string)Application.Current.Resources["clear_ram_notification"]);
- }
+ });
}
}
}
diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.cs
index d38fb5cd..48c8baef 100644
--- a/.Source/GTweak/View/DataSystemView.xaml.cs
+++ b/.Source/GTweak/View/DataSystemView.xaml.cs
@@ -1,8 +1,8 @@
using GTweak.Core.ViewModel;
using GTweak.Utilities;
+using GTweak.Utilities.Helpers;
using GTweak.Utilities.Tweaks;
using System;
-using System.ComponentModel;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
@@ -42,22 +42,20 @@ namespace GTweak.View
DataContext = new DataSystemVM();
};
- timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, delegate
+ timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, async delegate
{
if (time.TotalSeconds % 2 == 0)
{
- BackgroundWorker backgroundWorker = new BackgroundWorker();
- backgroundWorker.RunWorkerAsync();
- backgroundWorker.DoWork += delegate
+ BackgroundQueue backgroundQueue = new BackgroundQueue();
+ await backgroundQueue.QueueTask(delegate
{
Parallel.Invoke(SystemData.СomputerСonfiguration.UpdatingDeviceData);
Thread _thread = new Thread(() => { new SystemData.MonitoringSystem().GetCpuUsage(); }) { IsBackground = true };
_thread.Start();
- };
- backgroundWorker.RunWorkerCompleted += delegate
+ });
+ backgroundQueue.QueueCompleted(delegate
{
- Thread _thread = new Thread(() => { new SystemData.MonitoringSystem().CountProcess.ToString(); })
- { IsBackground = true };
+ Thread _thread = new Thread(() => { new SystemData.MonitoringSystem().CountProcess.ToString(); }) { IsBackground = true };
Application.Current.Dispatcher.Invoke(AnimationProgressBars);
if (BtnHiddenIP.IsChecked.Value & BtnHiddenIP.Visibility == Visibility.Hidden)
@@ -67,14 +65,13 @@ namespace GTweak.View
Timeline.SetDesiredFrameRate(doubleAnim, 400);
IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, doubleAnim);
}
- };
+ });
}
else if (time.TotalSeconds % 5 == 0)
{
- BackgroundWorker backgroundWorker = new BackgroundWorker();
- backgroundWorker.RunWorkerAsync();
- backgroundWorker.DoWork += delegate { SystemData.СomputerСonfiguration.GettingUserIP(); };
- backgroundWorker.RunWorkerCompleted += delegate { DataContext = new DataSystemVM(); };
+ BackgroundQueue backgroundQueue = new BackgroundQueue();
+ await backgroundQueue.QueueTask(delegate { SystemData.СomputerСonfiguration.GettingUserIP(); });
+ backgroundQueue.QueueCompleted(delegate { DataContext = new DataSystemVM(); });
}
time = time.Add(TimeSpan.FromSeconds(+1));
@@ -85,7 +82,7 @@ namespace GTweak.View
#region Animations
private void AnimationProgressBars()
{
- Parallel.Invoke(() =>
+ Parallel.Invoke(delegate
{
DoubleAnimation doubleAnim = new DoubleAnimation()
{
@@ -179,13 +176,11 @@ namespace GTweak.View
private void Page_Loaded(object sender, RoutedEventArgs e)
{
- Thread _thread = new Thread(() => { new SystemData.MonitoringSystem().GetCpuUsage(); })
- { IsBackground = true };
+ Thread _thread = new Thread(() => { new SystemData.MonitoringSystem().GetCpuUsage(); }) { IsBackground = true };
+
+ RAMLoad.Value = new SystemData.MonitoringSystem().RamUsage;
+ CPULoad.Value = SystemData.MonitoringSystem.CpuUsage;
- _thread = new Thread(() => { new SystemData.MonitoringSystem().CountProcess.ToString(); })
- { IsBackground = true };
- Application.Current.Dispatcher.Invoke(() => { CPULoad.Value = SystemData.MonitoringSystem.CpuUsage; });
- Application.Current.Dispatcher.Invoke(() => { RAMLoad.Value = new SystemData.MonitoringSystem().RamUsage; });
}
}
}
diff --git a/.Source/GTweak/View/PakagesView.xaml.cs b/.Source/GTweak/View/PakagesView.xaml.cs
index 83355dff..1d93db49 100644
--- a/.Source/GTweak/View/PakagesView.xaml.cs
+++ b/.Source/GTweak/View/PakagesView.xaml.cs
@@ -52,9 +52,7 @@ namespace GTweak.View
BackgroundQueue backgroundQueue = new BackgroundQueue();
await backgroundQueue.QueueTask(delegate { UninstallingPakages.DeletingPackage(applicationName); });
-
- if (backgroundQueue.IsQueueCompleted)
- UpdateViewStatePakages();
+ backgroundQueue.QueueCompleted(UpdateViewStatePakages);
break;
}
@@ -65,9 +63,7 @@ namespace GTweak.View
BackgroundQueue backgroundQueue = new BackgroundQueue();
await backgroundQueue.QueueTask(delegate { UninstallingPakages.ResetOneDriveAsync(); });
-
- if (backgroundQueue.IsQueueCompleted)
- UpdateViewStatePakages();
+ backgroundQueue.QueueCompleted(UpdateViewStatePakages);
break;
}
}
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index b0ae2916..8323e728 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -30,7 +30,6 @@ namespace GTweak.Windows
backgroundWorker.ProgressChanged += BackgroundWorker_ProgressChanged;
backgroundWorker.RunWorkerCompleted += async delegate
{
- backgroundWorker.Dispose();
new TypewriterAnimation((string)FindResource("text6_load"), TextLoad, TimeSpan.FromMilliseconds(300));
await Task.Delay(310);
this.Close();
diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml.cs b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
index cd4157db..7a17414d 100644
--- a/.Source/GTweak/Windows/NotificationWindow.xaml.cs
+++ b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
@@ -55,7 +55,6 @@ namespace GTweak.Windows
case "restart":
Process.Start("shutdown", "/r /t 0");
break;
-
}
}
}
@@ -116,13 +115,11 @@ namespace GTweak.Windows
Duration = TimeSpan.FromSeconds(0.8)
};
+ Left = primaryMonitorArea.Right - Width - 10;
Timeline.SetDesiredFrameRate(doubleAnim, 400);
Timeline.SetDesiredFrameRate(doubleAnimKeyFrames, 400);
BeginAnimation(Canvas.LeftProperty, doubleAnimKeyFrames);
BeginAnimation(OpacityProperty, doubleAnim);
-
-
- Left = primaryMonitorArea.Right - Width - 10;
}
private void Window_Closing(object sender, CancelEventArgs e)