Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
-sorted styles & added style rect
Greedeks666c4b8a3e9d
diff --git a/.Source/GTweak/App.xaml b/.Source/GTweak/App.xamlindex ee5faeaf..ee76dd59 100644--- a/.Source/GTweak/App.xaml+++ b/.Source/GTweak/App.xaml@@ -14,17 +14,18 @@<ResourceDictionary Source="Assets/DrawingImages/Installed/Applications.xaml" /><ResourceDictionary Source="Assets/DrawingImages/Other.xaml" /><ResourceDictionary Source="Styles/Themes/Dark/Colors.xaml" />- <ResourceDictionary Source="Styles/Buttons.xaml" />- <ResourceDictionary Source="Styles/RadioButtons.xaml" />- <ResourceDictionary Source="Styles/ToggleButtons.xaml" />- <ResourceDictionary Source="Styles/ScrollBar.xaml" />- <ResourceDictionary Source="Styles/Slider.xaml" />- <ResourceDictionary Source="Styles/TextBlock.xaml" />- <ResourceDictionary Source="Styles/Page.xaml" />- <ResourceDictionary Source="Styles/ProgressBar.xaml" />- <ResourceDictionary Source="Styles/Images.xaml" />- <ResourceDictionary Source="Styles/TextBox.xaml" />- <ResourceDictionary Source="Styles/ComboBox.xaml" />+ <ResourceDictionary Source="Styles/Buttons/Buttons.xaml" />+ <ResourceDictionary Source="Styles/Buttons/RadioButtons.xaml" />+ <ResourceDictionary Source="Styles/Buttons/ToggleButtons.xaml" />+ <ResourceDictionary Source="Styles/Display/ScrollBar.xaml" />+ <ResourceDictionary Source="Styles/Display/TextBlock.xaml" />+ <ResourceDictionary Source="Styles/Display/ProgressBar.xaml" />+ <ResourceDictionary Source="Styles/Inputs/Slider.xaml" />+ <ResourceDictionary Source="Styles/Inputs/TextBox.xaml" />+ <ResourceDictionary Source="Styles/Inputs/ComboBox.xaml" />+ <ResourceDictionary Source="Styles/Media/Page.xaml" />+ <ResourceDictionary Source="Styles/Media/Images.xaml" />+ <ResourceDictionary Source="Styles/Media/Rectangle.xaml" /></ResourceDictionary.MergedDictionaries></ResourceDictionary></Application.Resources>diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csprojindex 6b1bb522..a2421619 100644--- a/.Source/GTweak/GTweak.csproj+++ b/.Source/GTweak/GTweak.csproj@@ -357,43 +357,47 @@<SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\Buttons.xaml">+ <Page Include="Styles\Buttons\Buttons.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\ComboBox.xaml">+ <Page Include="Styles\Inputs\ComboBox.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\Images.xaml">+ <Page Include="Styles\Media\Images.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\Page.xaml">+ <Page Include="Styles\Media\Page.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\ProgressBar.xaml">+ <Page Include="Styles\Display\ProgressBar.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\RadioButtons.xaml">+ <Page Include="Styles\Buttons\RadioButtons.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\ScrollBar.xaml">+ <Page Include="Styles\Display\ScrollBar.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\Slider.xaml">+ <Page Include="Styles\Inputs\Slider.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\TextBlock.xaml">+ <Page Include="Styles\Display\TextBlock.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\TextBox.xaml">+ <Page Include="Styles\Inputs\TextBox.xaml">+ <SubType>Designer</SubType>+ <Generator>MSBuild:Compile</Generator>+ </Page>+ <Page Include="Styles\Media\Rectangle.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>@@ -409,7 +413,7 @@<SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\ToggleButtons.xaml">+ <Page Include="Styles\Buttons\ToggleButtons.xaml"><SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>diff --git a/.Source/GTweak/Styles/Buttons.xaml b/.Source/GTweak/Styles/Buttons/Buttons.xamlsimilarity index 100%rename from .Source/GTweak/Styles/Buttons.xamlrename to .Source/GTweak/Styles/Buttons/Buttons.xamldiff --git a/.Source/GTweak/Styles/RadioButtons.xaml b/.Source/GTweak/Styles/Buttons/RadioButtons.xamlsimilarity index 100%rename from .Source/GTweak/Styles/RadioButtons.xamlrename to .Source/GTweak/Styles/Buttons/RadioButtons.xamldiff --git a/.Source/GTweak/Styles/ToggleButtons.xaml b/.Source/GTweak/Styles/Buttons/ToggleButtons.xamlsimilarity index 100%rename from .Source/GTweak/Styles/ToggleButtons.xamlrename to .Source/GTweak/Styles/Buttons/ToggleButtons.xamldiff --git a/.Source/GTweak/Styles/ProgressBar.xaml b/.Source/GTweak/Styles/Display/ProgressBar.xamlsimilarity index 100%rename from .Source/GTweak/Styles/ProgressBar.xamlrename to .Source/GTweak/Styles/Display/ProgressBar.xamldiff --git a/.Source/GTweak/Styles/ScrollBar.xaml b/.Source/GTweak/Styles/Display/ScrollBar.xamlsimilarity index 100%rename from .Source/GTweak/Styles/ScrollBar.xamlrename to .Source/GTweak/Styles/Display/ScrollBar.xamldiff --git a/.Source/GTweak/Styles/TextBlock.xaml b/.Source/GTweak/Styles/Display/TextBlock.xamlsimilarity index 100%rename from .Source/GTweak/Styles/TextBlock.xamlrename to .Source/GTweak/Styles/Display/TextBlock.xamldiff --git a/.Source/GTweak/Styles/ComboBox.xaml b/.Source/GTweak/Styles/Inputs/ComboBox.xamlsimilarity index 100%rename from .Source/GTweak/Styles/ComboBox.xamlrename to .Source/GTweak/Styles/Inputs/ComboBox.xamldiff --git a/.Source/GTweak/Styles/Slider.xaml b/.Source/GTweak/Styles/Inputs/Slider.xamlsimilarity index 100%rename from .Source/GTweak/Styles/Slider.xamlrename to .Source/GTweak/Styles/Inputs/Slider.xamldiff --git a/.Source/GTweak/Styles/TextBox.xaml b/.Source/GTweak/Styles/Inputs/TextBox.xamlsimilarity index 100%rename from .Source/GTweak/Styles/TextBox.xamlrename to .Source/GTweak/Styles/Inputs/TextBox.xamldiff --git a/.Source/GTweak/Styles/Images.xaml b/.Source/GTweak/Styles/Media/Images.xamlsimilarity index 100%rename from .Source/GTweak/Styles/Images.xamlrename to .Source/GTweak/Styles/Media/Images.xamldiff --git a/.Source/GTweak/Styles/Page.xaml b/.Source/GTweak/Styles/Media/Page.xamlsimilarity index 100%rename from .Source/GTweak/Styles/Page.xamlrename to .Source/GTweak/Styles/Media/Page.xamldiff --git a/.Source/GTweak/Styles/Media/Rectangle.xaml b/.Source/GTweak/Styles/Media/Rectangle.xamlnew file mode 100644index 00000000..4ab27223--- /dev/null+++ b/.Source/GTweak/Styles/Media/Rectangle.xaml@@ -0,0 +1,23 @@+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008">++ <Style x:Key="BordersRectangle" TargetType="{x:Type Rectangle}">+ <Setter Property="Width" Value="Auto"/>+ <Setter Property="Height" Value="Auto"/>+ <Setter Property="RadiusX" Value="7"/>+ <Setter Property="RadiusY" Value="7"/>+ <Setter Property="StrokeThickness" Value="0.4"/>+ <Setter Property="Panel.ZIndex" Value="1"/>+ <Setter Property="IsHitTestVisible" Value="False"/>+ <Setter Property="Stroke">+ <Setter.Value>+ <LinearGradientBrush>+ <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>+ <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>+ </LinearGradientBrush>+ </Setter.Value>+ </Setter>+ </Style>++</ResourceDictionary>diff --git a/.Source/GTweak/Windows/ImportWindow.xaml b/.Source/GTweak/Windows/ImportWindow.xamlindex 8c31079d..f40d3363 100644--- a/.Source/GTweak/Windows/ImportWindow.xaml+++ b/.Source/GTweak/Windows/ImportWindow.xaml@@ -16,14 +16,7 @@<Grid MouseDown="TitleBar_MouseDown"><Grid Background="{StaticResource Color_Background}" Opacity="0.98">- <Rectangle Width="auto" Height="auto" RadiusX="7" RadiusY="7" StrokeThickness="0.4" Panel.ZIndex="1">- <Rectangle.Stroke>- <LinearGradientBrush>- <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>- <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>- </LinearGradientBrush>- </Rectangle.Stroke>- </Rectangle>+ <Rectangle Style="{StaticResource BordersRectangle}" d:Visibility="Collapsed"/><Grid Margin="0" Background="Transparent"><StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Center" Height="140" Margin="20,20,0,0">diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xamlindex 9e3c9e2b..06cb195f 100644--- a/.Source/GTweak/Windows/MainWindow.xaml+++ b/.Source/GTweak/Windows/MainWindow.xaml@@ -21,14 +21,7 @@</Window.Clip><Grid Background="{StaticResource Color_Background}" Opacity="0.98">- <Rectangle Width="auto" Height="auto" RadiusX="7" RadiusY="7" StrokeThickness="0.4" Panel.ZIndex="1">- <Rectangle.Stroke>- <LinearGradientBrush>- <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>- <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>- </LinearGradientBrush>- </Rectangle.Stroke>- </Rectangle>+ <Rectangle Style="{StaticResource BordersRectangle}" d:Visibility="Collapsed"/><Grid Margin="0" Background="Transparent"><Grid.RowDefinitions>diff --git a/.Source/GTweak/Windows/MessageWindow.xaml b/.Source/GTweak/Windows/MessageWindow.xamlindex 5a76b61e..458cc43d 100644--- a/.Source/GTweak/Windows/MessageWindow.xaml+++ b/.Source/GTweak/Windows/MessageWindow.xaml@@ -14,14 +14,7 @@<Grid MouseDown="TitleBar_MouseDown"><Grid Background="{StaticResource Color_Background}" Opacity="0.98">- <Rectangle Width="auto" Height="auto" RadiusX="7" RadiusY="7" StrokeThickness="0.4" Panel.ZIndex="1">- <Rectangle.Stroke>- <LinearGradientBrush>- <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>- <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>- </LinearGradientBrush>- </Rectangle.Stroke>- </Rectangle>+ <Rectangle Style="{StaticResource BordersRectangle}" d:Visibility="Collapsed"/><Grid Margin="0" Background="Transparent"><Grid x:Name="CreateWarn" Visibility="Visible">diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml b/.Source/GTweak/Windows/NotificationWindow.xamlindex 2b1e7a92..4b8830fe 100644--- a/.Source/GTweak/Windows/NotificationWindow.xaml+++ b/.Source/GTweak/Windows/NotificationWindow.xaml@@ -15,15 +15,8 @@</Window.Clip><Grid Background="{StaticResource Color_Background}" Opacity="0.98">- <Rectangle Width="auto" Height="auto" RadiusX="7" RadiusY="7" StrokeThickness="0.4" Panel.ZIndex="1">- <Rectangle.Stroke>- <LinearGradientBrush>- <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>- <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>- </LinearGradientBrush>- </Rectangle.Stroke>- </Rectangle>-+ <Rectangle Style="{StaticResource BordersRectangle}" d:Visibility="Collapsed"/>+<Grid><Grid.RowDefinitions><RowDefinition Height="28*"/>diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml b/.Source/GTweak/Windows/UpdateWindow.xamlindex b17c18fe..d27c3625 100644--- a/.Source/GTweak/Windows/UpdateWindow.xaml+++ b/.Source/GTweak/Windows/UpdateWindow.xaml@@ -15,17 +15,9 @@<Grid MouseDown="TitleBar_MouseDown"><Grid Background="{StaticResource Color_Background}" Opacity="0.98">- <Rectangle Width="auto" Height="auto" RadiusX="7" RadiusY="7" StrokeThickness="0.4" Panel.ZIndex="1">- <Rectangle.Stroke>- <LinearGradientBrush>- <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>- <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>- </LinearGradientBrush>- </Rectangle.Stroke>- </Rectangle>+ <Rectangle Style="{StaticResource BordersRectangle}" d:Visibility="Collapsed"/><Grid Margin="0" Background="Transparent">-<Grid x:Name="QuestionUpdate" Visibility="Visible"><Grid Margin="0" Background="Transparent"><Grid.RowDefinitions>