Skip to content

Portable Tool for an Ideal Windows Setup

upd. hide internal views from the toolbox & ref

Greedeksa9d8595a3e6a
diff --git a/.Source/GTweak/Assets/UserControls/ColorPicker.xaml b/.Source/GTweak/Assets/UserControls/ColorPicker.xaml
index fc2b4ac6..bbd07d09 100644
--- a/.Source/GTweak/Assets/UserControls/ColorPicker.xaml
+++ b/.Source/GTweak/Assets/UserControls/ColorPicker.xaml
@@ -94,8 +94,8 @@
</Grid>
</ToggleButton>
- <Popup x:Name="ColorPopup" Placement="Bottom" StaysOpen="False" AllowsTransparency="True" Opened="ColorPopup_Opened" Closed="ColorPopup_Closed" VerticalOffset="4">
- <Border x:Name="PopupBorder" Background="{StaticResource Brush_Background_ComboBox}" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" CornerRadius="8" Padding="12" Margin="10">
+ <Popup x:Name="ColorPopup" Placement="Bottom" StaysOpen="False" AllowsTransparency="True" Opened="ColorPopup_Opened" Closed="ColorPopup_Closed" VerticalOffset="2">
+ <Border x:Name="PopupBorder" Background="{StaticResource Brush_Background_ComboBox}" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" CornerRadius="8" Padding="12" Margin="10">
<Border.CacheMode>
<BitmapCache RenderAtScale="2" />
</Border.CacheMode>
diff --git a/.Source/GTweak/Core/ButtonNavigation.cs b/.Source/GTweak/Core/ButtonNavigation.cs
deleted file mode 100644
index ff392b0c..00000000
--- a/.Source/GTweak/Core/ButtonNavigation.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-
-namespace GTweak.Core
-{
- internal sealed class ButtonNavigation : RadioButton
- {
- static ButtonNavigation() => DefaultStyleKeyProperty.OverrideMetadata(typeof(ButtonNavigation), new FrameworkPropertyMetadata(typeof(ButtonNavigation)));
- }
-}
diff --git a/.Source/GTweak/Core/DataTemplate.xaml b/.Source/GTweak/Core/DataTemplate.xaml
index ac295c42..b908e26d 100644
--- a/.Source/GTweak/Core/DataTemplate.xaml
+++ b/.Source/GTweak/Core/DataTemplate.xaml
@@ -11,8 +11,8 @@
<view:InterfaceView />
</DataTemplate>
- <DataTemplate DataType="{x:Type vm:PakagesViewModel}">
- <view:PakagesView />
+ <DataTemplate DataType="{x:Type vm:PackagesViewModel}">
+ <view:PackagesView />
</DataTemplate>
<DataTemplate DataType="{x:Type vm:ServicesViewModel}">
diff --git a/.Source/GTweak/Core/Model/PakagesModel.cs b/.Source/GTweak/Core/Model/PackagesModel.cs
similarity index 87%
rename from .Source/GTweak/Core/Model/PakagesModel.cs
rename to .Source/GTweak/Core/Model/PackagesModel.cs
index 0397b213..417d78c5 100644
--- a/.Source/GTweak/Core/Model/PakagesModel.cs
+++ b/.Source/GTweak/Core/Model/PackagesModel.cs
@@ -1,8 +1,8 @@
-using GTweak.Core.Base;
+using GTweak.Core.Base;
namespace GTweak.Core.Model
{
- internal sealed class PakagesModel : ViewModelBase
+ internal sealed class PackagesModel : ViewModelBase
{
private string _name;
private bool _installed;
diff --git a/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs b/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
index 549c0f12..fd7055bf 100644
--- a/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
@@ -84,7 +84,7 @@ namespace GTweak.Core.ViewModel
private void NavigateToUtils(object obj) => CurrentView = new UtilsView();
private void NavigateToConfidentiality(object obj) => CurrentView = new ConfidentialityViewModel();
private void NavigateToInterface(object obj) => CurrentView = new InterfaceViewModel();
- private void NavigateToPackages(object obj) => CurrentView = new PakagesViewModel();
+ private void NavigateToPackages(object obj) => CurrentView = new PackagesViewModel();
private void NavigateToServices(object obj) => CurrentView = new ServicesViewModel();
private void NavigateToSystem(object obj) => CurrentView = new SystemViewModel();
private void NavigateToDataSystem(object obj) => CurrentView = new DataSystemViewModel();
diff --git a/.Source/GTweak/Core/ViewModel/PakagesViewModel.cs b/.Source/GTweak/Core/ViewModel/PackagesViewModel.cs
similarity index 83%
rename from .Source/GTweak/Core/ViewModel/PakagesViewModel.cs
rename to .Source/GTweak/Core/ViewModel/PackagesViewModel.cs
index ad60af6f..ac8ddbf8 100644
--- a/.Source/GTweak/Core/ViewModel/PakagesViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/PackagesViewModel.cs
@@ -12,17 +12,17 @@ using GTweak.Utilities.Tweaks;
namespace GTweak.Core.ViewModel
{
- internal class PakagesViewModel : ViewModelBase
+ internal class PackagesViewModel : ViewModelBase
{
- public ObservableCollection<PakagesModel> DisplayState { get; set; }
+ public ObservableCollection<PackagesModel> DisplayState { get; set; }
public Visibility Win11FeatureOnly => HardwareData.OS.IsWin11 ? Visibility.Visible : Visibility.Collapsed;
- public PakagesModel this[string name] => DisplayState.FirstOrDefault(d => d.Name == name);
+ public PackagesModel this[string name] => DisplayState.FirstOrDefault(d => d.Name == name);
- public PakagesViewModel()
+ public PackagesViewModel()
{
- DisplayState = new ObservableCollection<PakagesModel>();
+ DisplayState = new ObservableCollection<PackagesModel>();
BuildCollection();
@@ -30,7 +30,7 @@ namespace GTweak.Core.ViewModel
{
Application.Current.Dispatcher.BeginInvoke(new Action(() =>
{
- foreach (PakagesModel item in DisplayState)
+ foreach (PackagesModel item in DisplayState)
{
UpdatePackageState(item);
}
@@ -48,7 +48,7 @@ namespace GTweak.Core.ViewModel
string name = kv.Key;
UninstallingPakages.PackagesInfo details = kv.Value;
- PakagesModel pkg = new PakagesModel
+ PackagesModel pkg = new PackagesModel
{
Name = name,
IsUnavailable = !details.IsUnavailable
@@ -59,7 +59,7 @@ namespace GTweak.Core.ViewModel
}
}
- private void UpdatePackageState(PakagesModel item)
+ private void UpdatePackageState(PackagesModel item)
{
if (item != null && !string.IsNullOrWhiteSpace(item.Name) && UninstallingPakages.PackagesDetails?.TryGetValue(item?.Name, out var val) == true && val != null)
{
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index 9e8c2404..52732b4c 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -145,14 +145,14 @@
<Compile Include="Core\Model\ConfidentialityModel.cs" />
<Compile Include="Core\Model\DataSystemModel.cs" />
<Compile Include="Core\Model\InterfaceModel.cs" />
- <Compile Include="Core\Model\PakagesModel.cs" />
+ <Compile Include="Core\Model\PackagesModel.cs" />
<Compile Include="Core\Model\ServicesModel.cs" />
<Compile Include="Core\Model\SystemModel.cs" />
<Compile Include="Core\ViewModel\AddonsViewModel.cs" />
<Compile Include="Core\ViewModel\ConfidentialityViewModel.cs" />
<Compile Include="Core\ViewModel\DataSystemViewModel.cs" />
<Compile Include="Core\ViewModel\InterfaceViewModel.cs" />
- <Compile Include="Core\ViewModel\PakagesViewModel.cs" />
+ <Compile Include="Core\ViewModel\PackagesViewModel.cs" />
<Compile Include="Core\ViewModel\ServicesViewModel.cs" />
<Compile Include="Core\ViewModel\SystemViewModel.cs" />
<Compile Include="Utilities\Configuration\StorageTypeIdentifier.cs" />
@@ -185,8 +185,8 @@
<Compile Include="View\UtilsView.xaml.cs">
<DependentUpon>UtilsView.xaml</DependentUpon>
</Compile>
- <Compile Include="View\PakagesView.xaml.cs">
- <DependentUpon>PakagesView.xaml</DependentUpon>
+ <Compile Include="View\PackagesView.xaml.cs">
+ <DependentUpon>PackagesView.xaml</DependentUpon>
</Compile>
<Compile Include="View\ServicesView.xaml.cs">
<DependentUpon>ServicesView.xaml</DependentUpon>
@@ -380,7 +380,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="View\PakagesView.xaml">
+ <Page Include="View\PackagesView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -415,7 +415,6 @@
<DependentUpon>AssemblyInfo.tt</DependentUpon>
</Compile>
<Compile Include="Core\Base\ViewModelBase.cs" />
- <Compile Include="Core\ButtonNavigation.cs" />
<Compile Include="Core\RelayCommand.cs" />
<Compile Include="Utilities\Animation\BrushAnimation.cs" />
<Compile Include="Utilities\Animation\FactoryAnimation.cs" />
diff --git a/.Source/GTweak/View/AddonsView.xaml.cs b/.Source/GTweak/View/AddonsView.xaml.cs
index 30d32c5b..27e1d08b 100644
--- a/.Source/GTweak/View/AddonsView.xaml.cs
+++ b/.Source/GTweak/View/AddonsView.xaml.cs
@@ -1,10 +1,13 @@
using System;
+using System.ComponentModel;
using System.Windows.Controls;
using GTweak.Core.ViewModel;
using GTweak.Utilities.Managers;
namespace GTweak.View
{
+ [ToolboxItem(false)]
+ [DesignTimeVisible(false)]
public partial class AddonsView : UserControl
{
private TimerControlManager _timer = default;
diff --git a/.Source/GTweak/View/ConfidentialityView.xaml.cs b/.Source/GTweak/View/ConfidentialityView.xaml.cs
index d5781899..35c0d13d 100644
--- a/.Source/GTweak/View/ConfidentialityView.xaml.cs
+++ b/.Source/GTweak/View/ConfidentialityView.xaml.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -7,6 +8,8 @@ using GTweak.Utilities.Tweaks;
namespace GTweak.View
{
+ [ToolboxItem(false)]
+ [DesignTimeVisible(false)]
public partial class ConfidentialityView : UserControl
{
private readonly ConfidentialityTweaks _confTweaks = new ConfidentialityTweaks();
diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.cs
index ef850351..08c038b3 100644
--- a/.Source/GTweak/View/DataSystemView.xaml.cs
+++ b/.Source/GTweak/View/DataSystemView.xaml.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
@@ -17,6 +18,8 @@ using GTweak.Utilities.Managers;
namespace GTweak.View
{
+ [ToolboxItem(false)]
+ [DesignTimeVisible(false)]
public partial class DataSystemView : UserControl
{
private readonly SystemDataCollector _systemDataCollector = new SystemDataCollector();
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index 4e01e3ce..e9e82aaf 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -1,4 +1,5 @@
using System;
+using System.ComponentModel;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -9,6 +10,8 @@ using GTweak.Utilities.Tweaks;
namespace GTweak.View
{
+ [ToolboxItem(false)]
+ [DesignTimeVisible(false)]
public partial class InterfaceView : UserControl
{
private readonly InterfaceTweaks _intfTweaks = new InterfaceTweaks();
diff --git a/.Source/GTweak/View/PakagesView.xaml b/.Source/GTweak/View/PackagesView.xaml
similarity index 99%
rename from .Source/GTweak/View/PakagesView.xaml
rename to .Source/GTweak/View/PackagesView.xaml
index bc345853..f01616ba 100644
--- a/.Source/GTweak/View/PakagesView.xaml
+++ b/.Source/GTweak/View/PackagesView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="GTweak.View.PakagesView"
+<UserControl x:Class="GTweak.View.PackagesView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -9,7 +9,7 @@
xmlns:local="clr-namespace:GTweak.View"
mc:Ignorable="d" d:Width="1014" Style="{StaticResource LaunchPage}">
<UserControl.DataContext>
- <vm:PakagesViewModel />
+ <vm:PackagesViewModel />
</UserControl.DataContext>
<UserControl.Resources>
<Style TargetType="ToggleButton" x:Key="TglPackages" BasedOn="{StaticResource TglPackagesStyle}">
diff --git a/.Source/GTweak/View/PakagesView.xaml.cs b/.Source/GTweak/View/PackagesView.xaml.cs
similarity index 97%
rename from .Source/GTweak/View/PakagesView.xaml.cs
rename to .Source/GTweak/View/PackagesView.xaml.cs
index 54825837..2ddb65c6 100644
--- a/.Source/GTweak/View/PakagesView.xaml.cs
+++ b/.Source/GTweak/View/PackagesView.xaml.cs
@@ -11,7 +11,9 @@ using GTweak.Utilities.Tweaks;
namespace GTweak.View
{
- public partial class PakagesView : UserControl
+ [ToolboxItem(false)]
+ [DesignTimeVisible(false)]
+ public partial class PackagesView : UserControl
{
private TimerControlManager _timer = default;
private readonly BackgroundQueue _backgroundQueue = new BackgroundQueue();
@@ -19,7 +21,7 @@ namespace GTweak.View
private readonly UninstallingPakages _uninstalling = new UninstallingPakages();
private bool _isWebViewRemoval = false;
- public PakagesView()
+ public PackagesView()
{
InitializeComponent();
diff --git a/.Source/GTweak/View/ServicesView.xaml.cs b/.Source/GTweak/View/ServicesView.xaml.cs
index e933e79f..fcce68f6 100644
--- a/.Source/GTweak/View/ServicesView.xaml.cs
+++ b/.Source/GTweak/View/ServicesView.xaml.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -7,6 +8,8 @@ using GTweak.Utilities.Tweaks;
namespace GTweak.View
{
+ [ToolboxItem(false)]
+ [DesignTimeVisible(false)]
public partial class ServicesView : UserControl
{
private readonly ServicesTweaks _svcTweaks = new ServicesTweaks();
diff --git a/.Source/GTweak/View/SystemView.xaml.cs b/.Source/GTweak/View/SystemView.xaml.cs
index 11f829f0..ee6fae88 100644
--- a/.Source/GTweak/View/SystemView.xaml.cs
+++ b/.Source/GTweak/View/SystemView.xaml.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -7,6 +8,8 @@ using GTweak.Utilities.Tweaks;
namespace GTweak.View
{
+ [ToolboxItem(false)]
+ [DesignTimeVisible(false)]
public partial class SystemView : UserControl
{
private readonly SystemTweaks _sysTweaks = new SystemTweaks();
diff --git a/.Source/GTweak/View/UtilsView.xaml.cs b/.Source/GTweak/View/UtilsView.xaml.cs
index e44fcacb..6c394958 100644
--- a/.Source/GTweak/View/UtilsView.xaml.cs
+++ b/.Source/GTweak/View/UtilsView.xaml.cs
@@ -1,4 +1,5 @@
using System;
+using System.ComponentModel;
using System.IO;
using System.Windows.Controls;
using GTweak.Utilities.Configuration;
@@ -11,6 +12,8 @@ using Ookii.Dialogs.Wpf;
namespace GTweak.View
{
+ [ToolboxItem(false)]
+ [DesignTimeVisible(false)]
public partial class UtilsView : UserControl
{
private readonly SystemRestoreService _systemRestore = new SystemRestoreService();