Skip to content

Portable Tool for an Ideal Windows Setup

-added animation of buttons and text when loading the window -minor changes

Greedeks4d66e82bdf41
diff --git a/.Source/GTweak/Assets/UserControl/ToggleButton.xaml b/.Source/GTweak/Assets/UserControl/ToggleButton.xaml
index 8c598b55..706fae3d 100644
--- a/.Source/GTweak/Assets/UserControl/ToggleButton.xaml
+++ b/.Source/GTweak/Assets/UserControl/ToggleButton.xaml
@@ -18,7 +18,13 @@
</LinearGradientBrush>
</Rectangle.Fill>
</Rectangle>
- <Ellipse x:Name="Dot" Fill="White" Cursor="Hand" HorizontalAlignment="Left" Height="50" VerticalAlignment="Center" Width="50" StrokeThickness="1" KeyboardNavigation.IsTabStop="False" RenderTransformOrigin="1.31,0.51" Margin="5,0,0,0">
+ <Ellipse x:Name="Dot" Cursor="Hand" HorizontalAlignment="Left" Height="50" VerticalAlignment="Center" Width="50" StrokeThickness="1" KeyboardNavigation.IsTabStop="False" RenderTransformOrigin="1.31,0.51" Margin="5,0,0,0">
+ <Ellipse.Fill>
+ <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+ <GradientStop Color="#FFE8E8E8" Offset="0.131"/>
+ <GradientStop Color="#FFFFFFFF" Offset="1"/>
+ </LinearGradientBrush>
+ </Ellipse.Fill>
<Ellipse.Effect>
<DropShadowEffect ShadowDepth="1" Opacity="0.5"/>
</Ellipse.Effect>
diff --git a/.Source/GTweak/Styles/Buttons.xaml b/.Source/GTweak/Styles/Buttons.xaml
index 3c781aa3..1d57d7f9 100644
--- a/.Source/GTweak/Styles/Buttons.xaml
+++ b/.Source/GTweak/Styles/Buttons.xaml
@@ -19,6 +19,26 @@
</ControlTemplate>
</Setter.Value>
</Setter>
+ <Style.Triggers>
+ <Trigger Property="Visibility" Value="Visible">
+ <Setter Property="RenderTransform">
+ <Setter.Value>
+ <TranslateTransform X="0" Y="10"/>
+ </Setter.Value>
+ </Setter>
+ </Trigger>
+ <EventTrigger RoutedEvent="Loaded">
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)" From="10" To="0" Duration="0:0:1.2" DecelerationRatio="0.6">
+ <DoubleAnimation.EasingFunction>
+ <ElasticEase/>
+ </DoubleAnimation.EasingFunction>
+ </DoubleAnimation>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger>
+ </Style.Triggers>
</Style>
<Style TargetType="RadioButton" x:Key="BtnNavigation">
@@ -81,7 +101,7 @@
</Setter>
<Setter Property="Template">
<Setter.Value>
- <ControlTemplate TargetType="Button">
+ <ControlTemplate TargetType="{x:Type Button}">
<Grid>
<Border CornerRadius="5" Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
diff --git a/.Source/GTweak/Styles/ComboBox.xaml b/.Source/GTweak/Styles/ComboBox.xaml
index 295c6c8a..a7a42f9c 100644
--- a/.Source/GTweak/Styles/ComboBox.xaml
+++ b/.Source/GTweak/Styles/ComboBox.xaml
@@ -11,7 +11,7 @@
x:Name="Border"
Grid.Column="0"
Grid.ColumnSpan="2"
- CornerRadius="2"
+ CornerRadius="3"
Background="{StaticResource Color_Background_Dark}"
BorderBrush="{StaticResource Color_Accent}"
BorderThickness="1" />
@@ -60,7 +60,7 @@
<ContentPresenter Name="ContentSite" IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}"
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
- Margin="3,3,23,3"
+ Margin="5,3,23,3"
VerticalAlignment="Center"
HorizontalAlignment="Left" />
<TextBox x:Name="PART_EditableTextBox"
@@ -68,7 +68,7 @@
Template="{StaticResource ComboBoxTextBox}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
- Margin="3,3,23,3"
+ Margin="5,3,23,3"
Focusable="True"
Visibility="Hidden"
IsReadOnly="{TemplateBinding IsReadOnly}"/>
@@ -86,7 +86,7 @@
<Border
x:Name="DropDownBorder"
Background="{StaticResource Color_Background_Dark}"
- CornerRadius="2"
+ CornerRadius="3"
BorderThickness="1"
BorderBrush="{StaticResource Color_Accent}"/>
<ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
diff --git a/.Source/GTweak/Styles/Slider.xaml b/.Source/GTweak/Styles/Slider.xaml
index 2a814c10..6ecc5f2e 100644
--- a/.Source/GTweak/Styles/Slider.xaml
+++ b/.Source/GTweak/Styles/Slider.xaml
@@ -38,13 +38,10 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Thumb">
- <Border x:Name="Switch" Height="14" Width="14" Background="{StaticResource Color_Border}" CornerRadius="10" BorderBrush="{StaticResource Color_Background_Dark}" BorderThickness="1">
- <Ellipse x:Name="BodySwitch" Height="10" Width="10" Fill="Transparent"/>
- </Border>
+ <Border x:Name="Switch" Height="14" Width="14" Background="{StaticResource Color_Border}" CornerRadius="10" BorderBrush="{StaticResource Color_Background_Dark}" BorderThickness="1"/>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
- <Setter TargetName="Switch" Property="BorderBrush" Value="{StaticResource Color_Accent}"></Setter>
- <Setter TargetName="BodySwitch" Property="Fill" Value="{StaticResource Color_Accent}"></Setter>
+ <Setter TargetName="Switch" Property="Background" Value="{StaticResource Color_Accent}"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
diff --git a/.Source/GTweak/Utilities/Settings.cs b/.Source/GTweak/Utilities/Settings.cs
index 1bfaaf9b..759374f1 100644
--- a/.Source/GTweak/Utilities/Settings.cs
+++ b/.Source/GTweak/Utilities/Settings.cs
@@ -21,7 +21,7 @@ namespace GTweak.Utilities
private static bool _isViewNotification = true;
private static bool _isSoundNotification = true;
- private static byte _volumeNotification = 100;
+ private static byte _volumeNotification = 50;
private static string _language = App.GettingSystemLanguage;
private static string _theme = "Dark";
private static bool _isTopMost = false;
@@ -60,7 +60,7 @@ namespace GTweak.Utilities
{
IsViewNotification = bool.Parse(registryKey?.GetValue("Notification").ToString() ?? "True");
IsSoundNotification = bool.Parse(registryKey?.GetValue("Sound").ToString() ?? "True");
- VolumeNotification = byte.Parse(registryKey?.GetValue("Volume").ToString() ?? "100");
+ VolumeNotification = byte.Parse(registryKey?.GetValue("Volume").ToString() ?? "50");
IsTopMost = bool.Parse(registryKey?.GetValue("TopMost").ToString() ?? "False");
IsHiddenIpAddress = bool.Parse(registryKey?.GetValue("HiddenIP").ToString() ?? "False");
Language = registryKey?.GetValue("Language").ToString() ?? App.GettingSystemLanguage;
@@ -83,7 +83,7 @@ namespace GTweak.Utilities
IsSoundNotification = bool.Parse(registryKey?.GetValue("Sound").ToString() ?? "True");
break;
case "Volume":
- VolumeNotification = byte.Parse(registryKey?.GetValue("Volume").ToString() ?? "100");
+ VolumeNotification = byte.Parse(registryKey?.GetValue("Volume").ToString() ?? "50");
break;
case "TopMost":
IsTopMost = bool.Parse(registryKey?.GetValue("TopMost").ToString() ?? "False");
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index de81bd20..b386e11b 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -38,7 +38,7 @@
<Grid x:Name="TitleBar" Grid.Row="0" SnapsToDevicePixels="True" UseLayoutRounding="True" MouseDown="TitleBar_MouseDown">
<Border Background="{StaticResource Color_Background_Dark}" CornerRadius="7,7,0,0">
- <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{StaticResource Color_Accent}" FontSize="18" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
+ <TextBlock x:Name="UtilityTitle" FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{StaticResource Color_Accent}" FontSize="18" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock.Effect>
<DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
</TextBlock.Effect>
@@ -84,7 +84,7 @@
</Image>
</Button>
- <Button x:Name="ButtonMinimized" Style="{StaticResource TitleButtons}" VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="30" Margin="0,0,5,0" PreviewMouseDown="ButtonMinimized_PreviewMouseDown">
+ <Button x:Name="ButtonMinimized" VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="30" Margin="0,0,5,0" PreviewMouseDown="ButtonMinimized_PreviewMouseDown">
<Image Height="2" Width="3" Grid.Column="3" Margin="-12,3,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image.RenderTransform>
<TransformGroup>
@@ -105,6 +105,30 @@
</Style>
</Image.Style>
</Image>
+ <Button.Style>
+ <Style TargetType="{x:Type Button}" BasedOn="{StaticResource TitleButtons}">
+ <Style.Triggers>
+ <Trigger Property="Visibility" Value="Visible">
+ <Setter Property="RenderTransform">
+ <Setter.Value>
+ <TranslateTransform X="0" Y="-10"/>
+ </Setter.Value>
+ </Setter>
+ </Trigger>
+ <EventTrigger RoutedEvent="Loaded">
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)" From="-10" To="0" Duration="0:0:1.2" DecelerationRatio="0.6">
+ <DoubleAnimation.EasingFunction>
+ <ElasticEase/>
+ </DoubleAnimation.EasingFunction>
+ </DoubleAnimation>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger>
+ </Style.Triggers>
+ </Style>
+ </Button.Style>
</Button>
<Button x:Name="ButtonExit" Style="{StaticResource TitleButtons}" VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="30" Margin="0,0,10,0" PreviewMouseDown="ButtonExit_PreviewMouseDown">
diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.cs
index 6ccd677f..22be3a25 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
using GTweak.Utilities;
+using GTweak.Utilities.Helpers;
using GTweak.Utilities.Tweaks;
using GTweak.Windows;
using System;
@@ -124,6 +125,7 @@ namespace GTweak
};
Timeline.SetDesiredFrameRate(doubleAnim, 400);
BeginAnimation(OpacityProperty, doubleAnim);
+ new TypewriterAnimation(UtilityTitle.Text, UtilityTitle, TimeSpan.FromSeconds(0.4));
}
#endregion
diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml b/.Source/GTweak/Windows/NotificationWindow.xaml
index 4684e9f5..cd26cc7b 100644
--- a/.Source/GTweak/Windows/NotificationWindow.xaml
+++ b/.Source/GTweak/Windows/NotificationWindow.xaml
@@ -41,7 +41,7 @@
</TextBlock>
</Grid>
<Grid Grid.Column="1">
- <Button x:Name="BtnExit" Style="{StaticResource TitleButtons}" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="30" Margin="0,0,10,0" Cursor="Hand" PreviewMouseDown="BtnExit_PreviewMouseDown">
+ <Button x:Name="BtnExit" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="30" Margin="0,0,10,0" Cursor="Hand" PreviewMouseDown="BtnExit_PreviewMouseDown">
<Image Width="12">
<Image.Style>
<Style TargetType="{x:Type Image}">
@@ -54,6 +54,26 @@
</Style>
</Image.Style>
</Image>
+ <Button.Style>
+ <Style TargetType="{x:Type Button}" BasedOn="{StaticResource TitleButtons}">
+ <Style.Triggers>
+ <Trigger Property="Visibility" Value="Visible">
+ <Setter Property="RenderTransform">
+ <Setter.Value>
+ <TranslateTransform X="0" Y="0"/>
+ </Setter.Value>
+ </Setter>
+ </Trigger>
+ <EventTrigger RoutedEvent="Loaded">
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)" From="0" To="0" Duration="0"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger>
+ </Style.Triggers>
+ </Style>
+ </Button.Style>
</Button>
</Grid>
</Grid>
diff --git a/.Source/GTweak/Windows/WaitingWindow.xaml.cs b/.Source/GTweak/Windows/WaitingWindow.xaml.cs
index 72166a26..172ca73c 100644
--- a/.Source/GTweak/Windows/WaitingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/WaitingWindow.xaml.cs
@@ -47,7 +47,7 @@ namespace GTweak.Windows
To = 0.5,
SpeedRatio = 2,
EasingFunction = new QuadraticEase(),
- Duration = TimeSpan.FromSeconds(0.35)
+ Duration = TimeSpan.FromSeconds(0.3)
};
Timeline.SetDesiredFrameRate(doubleAnim, 400);
BeginAnimation(OpacityProperty, doubleAnim);