Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
refactor centralize description handling in DescriptionBlock, extract interfaces
Greedeksb9db55e29b45
diff --git a/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs b/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.csindex fc50195a..80227dd2 100644--- a/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs+++ b/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs@@ -4,6 +4,7 @@ using System.Globalization;using System.Threading;using System.Threading.Tasks;using System.Windows;+using System.Windows.Controls;using System.Windows.Media.Animation;using GTweak.Animations;using GTweak.Behaviors;@@ -34,6 +35,34 @@ namespace GTweak.Assets.UserControlsset => SetValue(TargetStateProperty, value);}+ internal object ContentSource+ {+ set+ {+ TargetState = null;+ string newText = DefaultText;++ switch (value)+ {+ case ToggleButton btn:+ TargetState = btn.State;+ newText = btn.Description?.ToString() ?? string.Empty;+ break;+ case System.Windows.Controls.Primitives.ToggleButton btn:+ newText = btn.ToolTip?.ToString() ?? string.Empty;+ break;+ case StackPanel panel:+ newText = panel.ToolTip?.ToString() ?? string.Empty;+ break;+ }++ if (_currentDefaultText != newText)+ {+ Text = newText;+ }+ }+ }+internal string Text{get => _currentDefaultText;diff --git a/.Source/GTweak/Core/Base/ViewModelPageBase.cs b/.Source/GTweak/Core/Base/ViewModelPageBase.csindex db6d25e9..abad2a04 100644--- a/.Source/GTweak/Core/Base/ViewModelPageBase.cs+++ b/.Source/GTweak/Core/Base/ViewModelPageBase.cs@@ -1,21 +1,11 @@using System.Collections.Generic;using System.Collections.ObjectModel;+using GTweak.Core.Interfaces;namespace GTweak.Core.Base{- internal interface IBasePageItem- {- string Name { get; set; }- bool State { get; set; }- }-- internal interface ITypedPageItem<T> : IBasePageItem- {- T Value { get; set; }- }-internal abstract class ViewModelPageBase<TModel, TTweaksClass> : ViewModelBase- where TModel : IBasePageItem, new()+ where TModel : IPageItem, new()where TTweaksClass : new(){private ObservableCollection<TModel> _toggles;diff --git a/.Source/GTweak/Core/Interfaces/IPageItem.cs b/.Source/GTweak/Core/Interfaces/IPageItem.csnew file mode 100644index 00000000..a6778be7--- /dev/null+++ b/.Source/GTweak/Core/Interfaces/IPageItem.cs@@ -0,0 +1,13 @@+namespace GTweak.Core.Interfaces+{+ internal interface IPageItem+ {+ string Name { get; set; }+ bool State { get; set; }+ }++ internal interface ITypedPageItem<T> : IPageItem+ {+ T Value { get; set; }+ }+}diff --git a/.Source/GTweak/Core/Base/IViewPageBase.cs b/.Source/GTweak/Core/Interfaces/IViewMarker.cssimilarity index 55%rename from .Source/GTweak/Core/Base/IViewPageBase.csrename to .Source/GTweak/Core/Interfaces/IViewMarker.csindex 280c7658..a422f46e 100644--- a/.Source/GTweak/Core/Base/IViewPageBase.cs+++ b/.Source/GTweak/Core/Interfaces/IViewMarker.cs@@ -1,8 +1,8 @@using System.ComponentModel;-namespace GTweak.Core.Base+namespace GTweak.Core.Interfaces{[ToolboxItem(false)][DesignTimeVisible(false)]- internal interface IViewPageBase { }+ internal interface IViewMarker { }}diff --git a/.Source/GTweak/Core/Model/ConfidentialityModel.cs b/.Source/GTweak/Core/Model/ConfidentialityModel.csindex b58f2a90..59c4a1e6 100644--- a/.Source/GTweak/Core/Model/ConfidentialityModel.cs+++ b/.Source/GTweak/Core/Model/ConfidentialityModel.cs@@ -1,8 +1,8 @@-using GTweak.Core.Base;+using GTweak.Core.Interfaces;namespace GTweak.Core.Model{- internal sealed class ConfidentialityModel : IBasePageItem+ internal sealed class ConfidentialityModel : IPageItem{public string Name { get; set; }public bool State { get; set; }diff --git a/.Source/GTweak/Core/Model/InterfaceModel.cs b/.Source/GTweak/Core/Model/InterfaceModel.csindex 5b32240b..b9726586 100644--- a/.Source/GTweak/Core/Model/InterfaceModel.cs+++ b/.Source/GTweak/Core/Model/InterfaceModel.cs@@ -1,4 +1,4 @@-using GTweak.Core.Base;+using GTweak.Core.Interfaces;namespace GTweak.Core.Model{diff --git a/.Source/GTweak/Core/Model/ServicesModel.cs b/.Source/GTweak/Core/Model/ServicesModel.csindex 7f305904..04770933 100644--- a/.Source/GTweak/Core/Model/ServicesModel.cs+++ b/.Source/GTweak/Core/Model/ServicesModel.cs@@ -1,8 +1,8 @@-using GTweak.Core.Base;+using GTweak.Core.Interfaces;namespace GTweak.Core.Model{- internal sealed class ServicesModel : IBasePageItem+ internal sealed class ServicesModel : IPageItem{public string Name { get; set; }public bool State { get; set; }diff --git a/.Source/GTweak/Core/Model/SystemModel.cs b/.Source/GTweak/Core/Model/SystemModel.csindex 1f307d97..0c5f98c2 100644--- a/.Source/GTweak/Core/Model/SystemModel.cs+++ b/.Source/GTweak/Core/Model/SystemModel.cs@@ -1,4 +1,4 @@-using GTweak.Core.Base;+using GTweak.Core.Interfaces;namespace GTweak.Core.Model{diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csprojindex 1ebe226f..3dd059f4 100644--- a/.Source/GTweak/GTweak.csproj+++ b/.Source/GTweak/GTweak.csproj@@ -188,7 +188,8 @@<DependentUpon>ToolsetCard.xaml</DependentUpon></Compile><Compile Include="Assets\ShaderEffects\ColorWheelEffect.cs" />- <Compile Include="Core\Base\IViewPageBase.cs" />+ <Compile Include="Core\Interfaces\IPageItem.cs" />+ <Compile Include="Core\Interfaces\IViewMarker.cs" /><Compile Include="Core\Base\ViewModelPageBase.cs" /><Compile Include="Converters\AngleToPercentConverter.cs" /><Compile Include="Converters\PercentToWidthConverter.cs" />diff --git a/.Source/GTweak/View/AddonsView.xaml.cs b/.Source/GTweak/View/AddonsView.xaml.csindex 8c88c5b1..f6a2e47a 100644--- a/.Source/GTweak/View/AddonsView.xaml.cs+++ b/.Source/GTweak/View/AddonsView.xaml.cs@@ -1,12 +1,12 @@using System;using System.Windows.Controls;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;using GTweak.Core.ViewModel;using GTweak.Modules.Managers;namespace GTweak.View{- public partial class AddonsView : UserControl, IViewPageBase+ public partial class AddonsView : UserControl, IViewMarker{private TimerControlManager _timer = default;public AddonsView()diff --git a/.Source/GTweak/View/ConfidentialityView.xaml.cs b/.Source/GTweak/View/ConfidentialityView.xaml.csindex 1a46ebc2..af76e4b8 100644--- a/.Source/GTweak/View/ConfidentialityView.xaml.cs+++ b/.Source/GTweak/View/ConfidentialityView.xaml.cs@@ -2,14 +2,14 @@ using System.Windows;using System.Windows.Controls;using System.Windows.Input;using GTweak.Assets.UserControls;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;using GTweak.Modules.Helpers;using GTweak.Modules.Managers;using GTweak.Modules.Tweaks;namespace GTweak.View{- public partial class ConfidentialityView : UserControl, IViewPageBase+ public partial class ConfidentialityView : UserControl, IViewMarker{private readonly ConfidentialityTweaks _confTweaks = new ConfidentialityTweaks();@@ -18,26 +18,14 @@ namespace GTweak.ViewInitializeComponent();}- private void Tweak_MouseEnter(object sender, MouseEventArgs e)- {- if (sender is ToggleButton tglButton && DescBlock.Text != tglButton.Description?.ToString())- {- DescBlock.Text = tglButton.Description?.ToString() ?? string.Empty;- DescBlock.TargetState = tglButton.State;- }- }-- private void Tweak_MouseLeave(object sender, MouseEventArgs e)- {- DescBlock.Text = DescBlock.DefaultText;- DescBlock.TargetState = null;- }+ private void Tweak_MouseEnter(object sender, MouseEventArgs e) => DescBlock.ContentSource = sender;+ private void Tweak_MouseLeave(object sender, MouseEventArgs e) => DescBlock.ContentSource = null;private void TglButton_ChangedState(object sender, RoutedEventArgs e){ToggleButton tglButton = (ToggleButton)sender;- DescBlock.TargetState = tglButton.State;+ DescBlock.ContentSource = tglButton;_confTweaks.Apply(tglButton.Name, tglButton.State);diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.csindex 984d28bb..c79fd984 100644--- a/.Source/GTweak/View/DataSystemView.xaml.cs+++ b/.Source/GTweak/View/DataSystemView.xaml.cs@@ -8,7 +8,7 @@ using System.Windows.Documents;using System.Windows.Input;using System.Windows.Media;using GTweak.Animations;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;using GTweak.Core.ViewModel;using GTweak.Modules.Common;using GTweak.Modules.Configuration;@@ -16,7 +16,7 @@ using GTweak.Modules.Managers;namespace GTweak.View{- public partial class DataSystemView : UserControl, IViewPageBase+ public partial class DataSystemView : UserControl, IViewMarker{private readonly HardwareProvider _hardwareProvider = new HardwareProvider();private readonly BackgroundQueueManager backgroundQueue = new BackgroundQueueManager();diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.csindex 5b8cffeb..2e9f53d2 100644--- a/.Source/GTweak/View/InterfaceView.xaml.cs+++ b/.Source/GTweak/View/InterfaceView.xaml.cs@@ -3,14 +3,14 @@ using System.Windows;using System.Windows.Controls;using System.Windows.Input;using GTweak.Assets.UserControls;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;using GTweak.Modules.Helpers;using GTweak.Modules.Managers;using GTweak.Modules.Tweaks;namespace GTweak.View{- public partial class InterfaceView : UserControl, IViewPageBase+ public partial class InterfaceView : UserControl, IViewMarker{private readonly InterfaceTweaks _intfTweaks = new InterfaceTweaks();private ExplorerManager.ExplorerAction _explorerAction = ExplorerManager.ExplorerAction.None;@@ -20,34 +20,8 @@ namespace GTweak.ViewInitializeComponent();}- private void Tweak_MouseEnter(object sender, MouseEventArgs e)- {- string description = string.Empty;- bool? state = null;-- switch (sender)- {- case StackPanel panel:- description = panel.ToolTip?.ToString() ?? string.Empty;- break;- case ToggleButton tglButton:- description = tglButton.Description?.ToString() ?? string.Empty;- state = tglButton.State;- break;- }-- if (DescBlock.Text != description)- {- DescBlock.Text = description;- DescBlock.TargetState = state;- }- }-- private void Tweak_MouseLeave(object sender, MouseEventArgs e)- {- DescBlock.Text = DescBlock.DefaultText;- DescBlock.TargetState = null;- }+ private void Tweak_MouseEnter(object sender, MouseEventArgs e) => DescBlock.ContentSource = sender;+ private void Tweak_MouseLeave(object sender, MouseEventArgs e) => DescBlock.ContentSource = null;private void ColorPicker_ColorPicked(object sender, EventArgs e){@@ -88,7 +62,7 @@ namespace GTweak.View{ToggleButton tglButton = (ToggleButton)sender;- DescBlock.TargetState = tglButton.State;+ DescBlock.ContentSource = tglButton;_intfTweaks.Apply(tglButton.Name, tglButton.State);diff --git a/.Source/GTweak/View/PackagesView.xaml.cs b/.Source/GTweak/View/PackagesView.xaml.csindex f630750a..b9ca5968 100644--- a/.Source/GTweak/View/PackagesView.xaml.cs+++ b/.Source/GTweak/View/PackagesView.xaml.cs@@ -4,14 +4,14 @@ using System.Windows.Controls;using System.Windows.Controls.Primitives;using System.Windows.Input;using System.Windows.Threading;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;using GTweak.Modules.Common;using GTweak.Modules.Managers;using GTweak.Modules.Tweaks;namespace GTweak.View{- public partial class PackagesView : UserControl, IViewPageBase+ public partial class PackagesView : UserControl, IViewMarker{private TimerControlManager _timer = default;private readonly BackgroundQueueManager _backgroundQueue = new BackgroundQueueManager();@@ -48,17 +48,8 @@ namespace GTweak.View};}- private void Package_MouseEnter(object sender, MouseEventArgs e)- {- string description = ((ToggleButton)sender).ToolTip?.ToString() ?? string.Empty;-- if (DescBlock.Text != description)- {- DescBlock.Text = description;- }- }-- private void Package_MouseLeave(object sender, MouseEventArgs e) => DescBlock.Text = DescBlock.DefaultText;+ private void Package_MouseEnter(object sender, MouseEventArgs e) => DescBlock.ContentSource = sender;+ private void Package_MouseLeave(object sender, MouseEventArgs e) => DescBlock.ContentSource = null;private async void ToggleButton_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e){diff --git a/.Source/GTweak/View/ServicesView.xaml.cs b/.Source/GTweak/View/ServicesView.xaml.csindex acd7ab73..9dc95f63 100644--- a/.Source/GTweak/View/ServicesView.xaml.cs+++ b/.Source/GTweak/View/ServicesView.xaml.cs@@ -2,13 +2,13 @@ using System.Windows;using System.Windows.Controls;using System.Windows.Input;using GTweak.Assets.UserControls;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;using GTweak.Modules.Managers;using GTweak.Modules.Tweaks;namespace GTweak.View{- public partial class ServicesView : UserControl, IViewPageBase+ public partial class ServicesView : UserControl, IViewMarker{private readonly ServicesTweaks _svcTweaks = new ServicesTweaks();@@ -17,26 +17,14 @@ namespace GTweak.ViewInitializeComponent();}- private void Tweak_MouseEnter(object sender, MouseEventArgs e)- {- if (sender is ToggleButton tglButton && DescBlock.Text != tglButton.Description?.ToString())- {- DescBlock.Text = tglButton.Description?.ToString() ?? string.Empty;- DescBlock.TargetState = tglButton.State;- }- }-- private void Tweak_MouseLeave(object sender, MouseEventArgs e)- {- DescBlock.Text = DescBlock.DefaultText;- DescBlock.TargetState = null;- }+ private void Tweak_MouseEnter(object sender, MouseEventArgs e) => DescBlock.ContentSource = sender;+ private void Tweak_MouseLeave(object sender, MouseEventArgs e) => DescBlock.ContentSource = null;private void TglButton_ChangedState(object sender, RoutedEventArgs e){ToggleButton tglButton = (ToggleButton)sender;- DescBlock.TargetState = tglButton.State;+ DescBlock.ContentSource = tglButton;_svcTweaks.Apply(tglButton.Name, tglButton.State);diff --git a/.Source/GTweak/View/SystemView.xaml.cs b/.Source/GTweak/View/SystemView.xaml.csindex f9aaf50c..77e6fed5 100644--- a/.Source/GTweak/View/SystemView.xaml.cs+++ b/.Source/GTweak/View/SystemView.xaml.cs@@ -2,14 +2,14 @@ using System.Windows;using System.Windows.Controls;using System.Windows.Input;using GTweak.Assets.UserControls;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;using GTweak.Modules.Helpers;using GTweak.Modules.Managers;using GTweak.Modules.Tweaks;namespace GTweak.View{- public partial class SystemView : UserControl, IViewPageBase+ public partial class SystemView : UserControl, IViewMarker{private readonly SystemTweaks _sysTweaks = new SystemTweaks();@@ -18,34 +18,8 @@ namespace GTweak.ViewInitializeComponent();}- private void Tweak_MouseEnter(object sender, MouseEventArgs e)- {- string description = string.Empty;- bool? state = null;-- switch (sender)- {- case StackPanel panel:- description = panel.ToolTip?.ToString() ?? string.Empty;- break;- case ToggleButton tglButton:- description = tglButton.Description?.ToString() ?? string.Empty;- state = tglButton.State;- break;- }-- if (DescBlock.Text != description)- {- DescBlock.Text = description;- DescBlock.TargetState = state;- }- }-- private void Tweak_MouseLeave(object sender, MouseEventArgs e)- {- DescBlock.Text = DescBlock.DefaultText;- DescBlock.TargetState = null;- }+ private void Tweak_MouseEnter(object sender, MouseEventArgs e) => DescBlock.ContentSource = sender;+ private void Tweak_MouseLeave(object sender, MouseEventArgs e) => DescBlock.ContentSource = null;private void Slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) => _sysTweaks.Apply(((Slider)sender).Name, (uint)((Slider)sender).Value);@@ -53,7 +27,7 @@ namespace GTweak.View{ToggleButton tglButton = (ToggleButton)sender;- DescBlock.TargetState = tglButton.State;+ DescBlock.ContentSource = tglButton;if (tglButton.Name != "TglButton3"){diff --git a/.Source/GTweak/View/ToolsetView.xaml.cs b/.Source/GTweak/View/ToolsetView.xaml.csindex c80bed00..49384a28 100644--- a/.Source/GTweak/View/ToolsetView.xaml.cs+++ b/.Source/GTweak/View/ToolsetView.xaml.cs@@ -1,9 +1,9 @@using System.Windows.Controls;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;namespace GTweak.View{- public partial class ToolsetView : UserControl, IViewPageBase+ public partial class ToolsetView : UserControl, IViewMarker{public ToolsetView(){diff --git a/.Source/GTweak/View/UtilsView.xaml.cs b/.Source/GTweak/View/UtilsView.xaml.csindex 5ed4e001..d2e9ca78 100644--- a/.Source/GTweak/View/UtilsView.xaml.cs+++ b/.Source/GTweak/View/UtilsView.xaml.cs@@ -1,7 +1,7 @@using System;using System.IO;using System.Windows.Controls;-using GTweak.Core.Base;+using GTweak.Core.Interfaces;using GTweak.Modules.Common;using GTweak.Modules.Configuration;using GTweak.Modules.Maintenance;@@ -11,7 +11,7 @@ using Ookii.Dialogs.Wpf;namespace GTweak.View{- public partial class UtilsView : UserControl, IViewPageBase+ public partial class UtilsView : UserControl, IViewMarker{private readonly SystemRestoreService _systemRestore = new SystemRestoreService();private readonly NTFSCompressor _ntfsCompressor = new NTFSCompressor();