Skip to content

Portable Tool for an Ideal Windows Setup

-ref/edit

Greedeks44b2db0428f9
diff --git a/.Source/GTweak/Core/Model/MainModel.cs b/.Source/GTweak/Core/Model/MainModel.cs
index e615554f..4c25fd7f 100644
--- a/.Source/GTweak/Core/Model/MainModel.cs
+++ b/.Source/GTweak/Core/Model/MainModel.cs
@@ -2,7 +2,7 @@
namespace GTweak.Core.Model
{
- internal sealed class MainModel
+ internal class MainModel
{
internal sealed class InterfaceModel
{
diff --git a/.Source/GTweak/Core/ViewModel/MainViewModel.cs b/.Source/GTweak/Core/ViewModel/MainViewModel.cs
index 99df2a6a..d3e85bc5 100644
--- a/.Source/GTweak/Core/ViewModel/MainViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/MainViewModel.cs
@@ -1,5 +1,4 @@
-using GTweak.Core.Model;
-using GTweak.Utilities.Tweaks;
+using GTweak.Utilities.Tweaks;
using System;
using System.Reflection;
using System.Windows;
@@ -10,7 +9,7 @@ namespace GTweak.Core.ViewModel
{
internal class MainViewModel : ViewModelBase
{
- private readonly MainModel.MainWindowModel _model;
+ private readonly MainWindowModel model;
private object _currentView;
public object CurrentView
@@ -21,20 +20,20 @@ namespace GTweak.Core.ViewModel
public ImageSource DisplayProfileAvatar
{
- get => _model.ProfileAvatar;
- set { _model.ProfileAvatar = value; OnPropertyChanged(); }
+ get => model.ProfileAvatar;
+ set { model.ProfileAvatar = value; OnPropertyChanged(); }
}
public string DisplayProfileName
{
- get => _model.ProfileName;
- set { _model.ProfileName = value; OnPropertyChanged(); }
+ get => model.ProfileName;
+ set { model.ProfileName = value; OnPropertyChanged(); }
}
public string DisplayTweakVersion
{
- get => _model.TweakVersion;
- set { _model.TweakVersion = value; OnPropertyChanged(); }
+ get => model.TweakVersion;
+ set { model.TweakVersion = value; OnPropertyChanged(); }
}
public ICommand ConfidentialityCommand { get; set; }
@@ -56,7 +55,7 @@ namespace GTweak.Core.ViewModel
public MainViewModel()
{
- _model = new MainModel.MainWindowModel();
+ model = new MainWindowModel();
DisplayProfileAvatar = SystemData.ProfileData.GetProfileImage() ?? Application.Current.Resources["DI_AvatarProfile"] as DrawingImage;
DisplayProfileName = SystemData.ProfileData.GetProfileName();
diff --git a/.Source/GTweak/Core/ViewModel/PagesViewModel.cs b/.Source/GTweak/Core/ViewModel/PagesViewModel.cs
index c24f14ed..f4cb7c16 100644
--- a/.Source/GTweak/Core/ViewModel/PagesViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/PagesViewModel.cs
@@ -1,5 +1,4 @@
-using GTweak.Core.Model;
-using GTweak.Utilities;
+using GTweak.Utilities;
using GTweak.Utilities.Tweaks;
using System.Windows;
using System.Windows.Media;
@@ -7,119 +6,119 @@ using System.Windows.Media;
namespace GTweak.Core.ViewModel
{
internal class ConfidentialityVM : ViewModelBase { }
+ internal class ApplicationsVM : ViewModelBase { }
+ internal class ServicesVM : ViewModelBase { }
+ internal class SystemVM : ViewModelBase { }
+ internal class MoreVM : ViewModelBase { }
+
+
internal class InterfaceVM : ViewModelBase
{
- private readonly MainModel.InterfaceModel _model;
+ private readonly InterfaceModel model;
public bool IsBlockForWin10
{
- get => _model.IsBlockWin10;
- set { _model.IsBlockWin10 = value; OnPropertyChanged(); }
+ get => model.IsBlockWin10;
+ set { model.IsBlockWin10 = value; OnPropertyChanged(); }
}
public bool IsBlockWithoutLicense
{
- get => _model.IsBlockLicense;
- set { _model.IsBlockLicense = value; OnPropertyChanged(); }
+ get => model.IsBlockLicense;
+ set { model.IsBlockLicense = value; OnPropertyChanged(); }
}
public InterfaceVM()
{
- _model = new MainModel.InterfaceModel();
+ model = new InterfaceModel();
IsBlockForWin10 = SystemData.СomputerСonfiguration.clientWinVersion.Contains("11");
IsBlockWithoutLicense = WindowsLicense.statusLicense == 1;
}
}
- internal class ApplicationsVM : ViewModelBase { }
- internal class ServicesVM : ViewModelBase { }
- internal class SystemVM : ViewModelBase { }
- internal class MoreVM : ViewModelBase { }
-
internal class InformationSystemVM : ViewModelBase
{
- private readonly MainModel.InformationSystemModel _model;
+ private readonly InformationSystemModel model;
public string DisplayWindowsName
{
- get => _model.WindowsName;
- set { _model.WindowsName = value; OnPropertyChanged(); }
+ get => model.WindowsName;
+ set { model.WindowsName = value; OnPropertyChanged(); }
}
public string DisplayBiosName
{
- get => _model.BIOSName;
- set { _model.BIOSName = value; OnPropertyChanged(); }
+ get => model.BIOSName;
+ set { model.BIOSName = value; OnPropertyChanged(); }
}
public string DisplayMotherBrName
{
- get => _model.MotherBrName;
- set { _model.MotherBrName = value; OnPropertyChanged(); }
+ get => model.MotherBrName;
+ set { model.MotherBrName = value; OnPropertyChanged(); }
}
public string DisplayCpuName
{
- get => _model.CPUName;
- set { _model.CPUName = value; OnPropertyChanged(); }
+ get => model.CPUName;
+ set { model.CPUName = value; OnPropertyChanged(); }
}
public string DisplayGpuName
{
- get => _model.GPUName;
- set { _model.GPUName = value; OnPropertyChanged(); }
+ get => model.GPUName;
+ set { model.GPUName = value; OnPropertyChanged(); }
}
public string DisplayRamName
{
- get => _model.RAMName;
- set { _model.RAMName = value; OnPropertyChanged(); }
+ get => model.RAMName;
+ set { model.RAMName = value; OnPropertyChanged(); }
}
public string DisplayDiskName
{
- get => _model.DiskName;
- set { _model.DiskName = value; OnPropertyChanged(); }
+ get => model.DiskName;
+ set { model.DiskName = value; OnPropertyChanged(); }
}
public string DisplaySoundName
{
- get => _model.SoundName;
- set { _model.SoundName = value; OnPropertyChanged(); }
+ get => model.SoundName;
+ set { model.SoundName = value; OnPropertyChanged(); }
}
public string DisplayNetAdapterName
{
- get => _model.NetAdapterName;
- set { _model.NetAdapterName = value; OnPropertyChanged(); }
+ get => model.NetAdapterName;
+ set { model.NetAdapterName = value; OnPropertyChanged(); }
}
public string DisplayIpAddress
{
- get => _model.IpAddress;
- set { _model.IpAddress = value; OnPropertyChanged(); }
+ get => model.IpAddress;
+ set { model.IpAddress = value; OnPropertyChanged(); }
}
public string DisplayCountProcess
{
- get => _model.CountProcess;
- set { _model.CountProcess = value; OnPropertyChanged(); }
+ get => model.CountProcess;
+ set { model.CountProcess = value; OnPropertyChanged(); }
}
public int SetBlurValue
{
- get => _model.BlurValue;
- set { _model.BlurValue = value; OnPropertyChanged("SetBlurValue"); }
+ get => model.BlurValue;
+ set { model.BlurValue = value; OnPropertyChanged("SetBlurValue"); }
}
public DrawingImage DisplayImageHidden
{
- get => _model.ImageHidden;
- set { _model.ImageHidden = value; OnPropertyChanged(); }
+ get => model.ImageHidden;
+ set { model.ImageHidden = value; OnPropertyChanged(); }
}
-
public InformationSystemVM()
{
- _model = new MainModel.InformationSystemModel();
+ model = new InformationSystemModel();
DisplayWindowsName = SystemData.СomputerСonfiguration.СonfigurationData["Windows"];
DisplayBiosName = SystemData.СomputerСonfiguration.СonfigurationData["BIOS"];
diff --git a/.Source/GTweak/Core/ViewModelBase.cs b/.Source/GTweak/Core/ViewModelBase.cs
index c6d3f461..4904fe3f 100644
--- a/.Source/GTweak/Core/ViewModelBase.cs
+++ b/.Source/GTweak/Core/ViewModelBase.cs
@@ -1,9 +1,10 @@
-using System.ComponentModel;
+using GTweak.Core.Model;
+using System.ComponentModel;
using System.Runtime.CompilerServices;
namespace GTweak.Core
{
- internal class ViewModelBase : INotifyPropertyChanged
+ internal class ViewModelBase : MainModel, INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
public void OnPropertyChanged([CallerMemberName] string _propName = null)
diff --git a/.Source/GTweak/Utilities/DisablingWinKeys.cs b/.Source/GTweak/Utilities/DisablingWinKeys.cs
index ac0b0522..1b29b488 100644
--- a/.Source/GTweak/Utilities/DisablingWinKeys.cs
+++ b/.Source/GTweak/Utilities/DisablingWinKeys.cs
@@ -45,9 +45,6 @@ namespace GTweak.Utilities
return CallNextHookEx(ptrHook, nCode, wp, lp);
}
- private bool HasAltModifier(int flags)
- {
- return (flags & 0x20) == 0x20;
- }
+ private bool HasAltModifier(int flags) => (flags & 0x20) == 0x20;
}
}
diff --git a/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs b/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
index f55c119d..60a41c67 100644
--- a/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
@@ -70,7 +70,6 @@ namespace GTweak.Utilities.Tweaks
internal static void EmptyWorkingSetFunction()
{
-
string ProcessName = string.Empty;
Process[] allProcesses = Process.GetProcesses();
List<string> successProcesses = new List<string>();
@@ -95,18 +94,12 @@ namespace GTweak.Utilities.Tweaks
successProcesses.Add(ProcessName);
}
}
- catch (Exception ex)
- {
- failProcesses.Add(ProcessName + ": " + ex.Message);
- }
+ catch (Exception ex) { failProcesses.Add(ProcessName + ": " + ex.Message); }
}
}
- internal static bool Is64BitMode()
- {
- return Marshal.SizeOf(typeof(IntPtr)) == 8;
- }
+ internal static bool Is64BitMode() => Marshal.SizeOf(typeof(IntPtr)) == 8;
internal static void ClearFileSystemCache(bool ClearStandbyCache)
{
@@ -185,7 +178,7 @@ namespace GTweak.Utilities.Tweaks
{
Process.Start(new ProcessStartInfo()
{
- Arguments = @"/c rd /s /q " + Settings.PathSystemDisk + @"\Windows\Temp & rd /s /q %localappdata%\Temp &
+ Arguments = @"/c rd /s /q " + Settings.PathSystemDisk + @"Windows\Temp & rd /s /q %localappdata%\Temp &
del /a /q ""%localappdata%\IconCache.db"" & del /a /f /q ""%localappdata%\Microsoft\Windows\Explorer\iconcache*""",
WindowStyle = ProcessWindowStyle.Hidden,
CreateNoWindow = true,
diff --git a/.Source/GTweak/View/InformationSystemView.xaml.cs b/.Source/GTweak/View/InformationSystemView.xaml.cs
index 8429f52b..441c97f8 100644
--- a/.Source/GTweak/View/InformationSystemView.xaml.cs
+++ b/.Source/GTweak/View/InformationSystemView.xaml.cs
@@ -25,7 +25,7 @@ namespace GTweak.View
{
InitializeComponent();
- App.LanguageChanged += (s, e) =>
+ App.LanguageChanged += delegate
{
if (!SystemData.СomputerСonfiguration.isConnectionLose)
{
@@ -53,13 +53,13 @@ namespace GTweak.View
{
BackgroundWorker backgroundWorker = new BackgroundWorker();
backgroundWorker.RunWorkerAsync();
- backgroundWorker.DoWork += (s, e) =>
+ backgroundWorker.DoWork += delegate
{
Parallel.Invoke(SystemData.СomputerСonfiguration.UpdatingDeviceData);
new Thread(() => new SystemData.MonitoringSystem().GetCpuUsage()).Start();
new Thread(() => new SystemData.MonitoringSystem().GetCpuUsage()).IsBackground = true;
};
- backgroundWorker.RunWorkerCompleted += (s, e) =>
+ backgroundWorker.RunWorkerCompleted += delegate
{
new Thread(() => new SystemData.MonitoringSystem().CountProcess.ToString()).Start();
new Thread(() => new SystemData.MonitoringSystem().CountProcess.ToString()).IsBackground = true;