Skip to content

Portable Tool for an Ideal Windows Setup

-new load window & progress bar

Greedeks18167bb942ec
diff --git a/.Source/GTweak/Assets/DrawingImages/Other.xaml b/.Source/GTweak/Assets/DrawingImages/Other.xaml
index fc82174d..f592ca1c 100644
--- a/.Source/GTweak/Assets/DrawingImages/Other.xaml
+++ b/.Source/GTweak/Assets/DrawingImages/Other.xaml
@@ -155,18 +155,6 @@
</DrawingImage.Drawing>
</DrawingImage>
- <DrawingImage x:Key="DI_Splash">
- <DrawingImage.Drawing>
- <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
- <GeometryDrawing Brush="{DynamicResource Color_Background}" Geometry="F1 M512,512z M0,0z M141.1,467.1L371.1,467.1C377.3,467.1,383,463.8,386,458.5L501,259.3C504.1,254,504.1,247.4,501,242L386,42.9C382.9,37.6,377.2,34.3,371.1,34.3L141.1,34.3C134.9,34.3,129.2,37.6,126.2,42.9L11.2,242.1C8.1,247.4,8.1,254,11.2,259.3L126.1,458.5C129.2,463.8,134.9,467.1,141.1,467.1z">
- <GeometryDrawing.Pen>
- <Pen Brush="{DynamicResource Color_Accent}" Thickness="1.2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
- </GeometryDrawing.Pen>
- </GeometryDrawing>
- </DrawingGroup>
- </DrawingImage.Drawing>
- </DrawingImage>
-
<DrawingImage x:Key="DI_Sandtime">
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V95 H95 V0 H0 Z">
diff --git a/.Source/GTweak/Styles/ProgressBar.xaml b/.Source/GTweak/Styles/ProgressBar.xaml
index bb42097f..d86dd744 100644
--- a/.Source/GTweak/Styles/ProgressBar.xaml
+++ b/.Source/GTweak/Styles/ProgressBar.xaml
@@ -24,9 +24,9 @@
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
- <Border x:Name="PART_Track" CornerRadius="1" BorderThickness="1">
+ <Border x:Name="PART_Track" CornerRadius="2" BorderThickness="1">
<Border.BorderBrush>
- <SolidColorBrush Color="#1a1a1a" />
+ <SolidColorBrush Color="{StaticResource Color_Border_Gradient_1}" />
</Border.BorderBrush>
</Border>
<Border x:Name="PART_Indicator" CornerRadius="1" BorderThickness="1" HorizontalAlignment="Left" Background="{TemplateBinding Foreground}">
@@ -34,7 +34,7 @@
<SolidColorBrush Color="{StaticResource Color_Border_Gradient_1}"/>
</Border.BorderBrush>
<Grid ClipToBounds="True" x:Name="Animation">
- <Rectangle x:Name="PART_GlowRect" Width="30" HorizontalAlignment="Left" Fill="{StaticResource Color_Accent}" Margin="-100,0,0,0" />
+ <Rectangle x:Name="PART_GlowRect" Width="60" HorizontalAlignment="Left" Fill="{StaticResource Color_Accent}" Margin="-100,0,0,0"/>
</Grid>
</Border>
</Grid>
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml b/.Source/GTweak/Windows/LoadingWindow.xaml
index 019cc201..563e3d42 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml
@@ -7,25 +7,50 @@
xmlns:local="clr-namespace:GTweak.Windows"
mc:Ignorable="d"
Title="GTweak" WindowStyle="None"
- Height="250" Width="250"
+ Height="300" Width="300"
Background="Transparent" AllowsTransparency="True" WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize" SnapsToDevicePixels="True" UseLayoutRounding="True"
IsTabStop="False" Opacity="0.98" ContentRendered="Window_ContentRendered" Closing="Window_Closing">
<Window.DataContext>
<vm:MainViewModel/>
</Window.DataContext>
-
+
<Grid>
- <Image>
- <Image.Style>
- <Style TargetType="Image">
- <Setter Property="Source" Value="{StaticResource DI_Splash}"/>
- </Style>
- </Image.Style>
- <Image.Effect>
- <DropShadowEffect BlurRadius="5" ShadowDepth="0" Opacity="0.7" Color="#000000" />
- </Image.Effect>
- </Image>
+ <Path Stroke="{StaticResource Color_Background}" StrokeThickness="6" Opacity="0.5" Margin="149,152,-152,-152">
+ <Path.Data>
+ <EllipseGeometry RadiusX="120" RadiusY="120"/>
+ </Path.Data>
+ </Path>
+
+ <Path Stroke="{StaticResource Color_Accent}" StrokeThickness="6" Margin="149,152,-152,-152">
+ <Path.Effect>
+ <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />
+ </Path.Effect>
+ <Path.Data>
+ <PathGeometry>
+ <PathFigure StartPoint="0,-120">
+ <ArcSegment Point="102,-62.88" Size="120,120"
+ IsLargeArc="False" SweepDirection="Clockwise"/>
+ </PathFigure>
+ <PathGeometry.Transform>
+ <RotateTransform/>
+ </PathGeometry.Transform>
+ </PathGeometry>
+ </Path.Data>
+ <Path.Triggers>
+ <EventTrigger RoutedEvent="Loaded">
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="Data.Transform.Angle" To="360" Duration="0:0:4" SpeedRatio="3" RepeatBehavior="Forever"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger>
+ </Path.Triggers>
+ </Path>
+ <Grid VerticalAlignment="Center" HorizontalAlignment="Center">
+ <Ellipse Height="220" Width="220" Fill="{StaticResource Color_Background}" StrokeThickness="6.6" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.95"/>
+
+
<StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,30,0,0">
<TextBlock x:Name="TextTittle" Text="{DynamicResource title0_load}" Foreground="{StaticResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium">
@@ -44,20 +69,18 @@
</TextBlock.Triggers>
</TextBlock>
- <Border BorderBrush="{StaticResource Color_Accent}" BorderThickness="1.2" CornerRadius="50" Width="75" Height="75" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,26,0,0">
- <Border CornerRadius="50">
- <Border.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />
- </Border.Effect>
- <Border.Background>
- <ImageBrush x:Name="ProfileAvatar" ImageSource="{Binding DisplayProfileAvatar}" Stretch="Uniform"/>
- </Border.Background>
+ <Border BorderBrush="{StaticResource Color_Accent}" BorderThickness="1.2" CornerRadius="50" Width="75" Height="75" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,26,0,0">
+ <Border CornerRadius="50">
+ <Border.Effect>
+ <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />
+ </Border.Effect>
+ <Border.Background>
+ <ImageBrush x:Name="ProfileAvatar" ImageSource="{Binding DisplayProfileAvatar}" Stretch="Uniform"/>
+ </Border.Background>
+ </Border>
</Border>
- </Border>
-
- <ProgressBar Width="100" Height="5" Margin="0,20,0,0" IsIndeterminate="True" Style="{StaticResource ProgressBarStyle}"/>
- <TextBlock x:Name="TextLoad" Text="{DynamicResource text0_load}" Foreground="{StaticResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" Margin="0,20,0,0"/>
+ <TextBlock x:Name="TextLoad" Text="{DynamicResource text0_load}" Foreground="{StaticResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" Margin="0,20,0,0"/>
</StackPanel>
-
+ </Grid>
</Grid>
</Window>
diff --git a/.Source/GTweak/Windows/RebootWindow.xaml b/.Source/GTweak/Windows/RebootWindow.xaml
index fee1bded..b8eb2d86 100644
--- a/.Source/GTweak/Windows/RebootWindow.xaml
+++ b/.Source/GTweak/Windows/RebootWindow.xaml
@@ -12,9 +12,9 @@
IsTabStop="False" Opacity="0.98" Topmost="True" ShowInTaskbar="False" Loaded="Window_Loaded">
<Grid>
<Ellipse Height="140" Width="140" Fill="{StaticResource Color_Background_Dark}" StrokeThickness="6.6" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <Ellipse Height="160" Width="160" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="6.6" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+ <Ellipse Height="160" Width="160" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <xrpb:RadialProgressBar x:Name="RestartProgress" Value="0" Maximum="100" Width="170" Height="170" ArcWidth="6" VerticalAlignment="Center" HorizontalAlignment="Center">
+ <xrpb:RadialProgressBar x:Name="RestartProgress" Value="20" Maximum="100" Width="170" Height="170" ArcWidth="4" VerticalAlignment="Center" HorizontalAlignment="Center">
<xrpb:RadialProgressBar.Foreground>
<LinearGradientBrush EndPoint="0,0.3" StartPoint="0.9,0" ColorInterpolationMode="ScRgbLinearInterpolation" MappingMode="RelativeToBoundingBox" SpreadMethod="Pad">
<GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="0.7"/>
diff --git a/Assets/SVG Others/Splash.svg b/Assets/SVG Others/Splash.svg
deleted file mode 100644
index 17637b66..00000000
--- a/Assets/SVG Others/Splash.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
- .st0{fill:#4D4D4D;stroke:#000000;stroke-width:15;stroke-miterlimit:10;}
-</style>
-<path class="st0" d="M141.1,467.1h230c6.2,0,11.9-3.3,14.9-8.6l115-199.2c3.1-5.3,3.1-11.9,0-17.3L386,42.9
- c-3.1-5.3-8.8-8.6-14.9-8.6h-230c-6.2,0-11.9,3.3-14.9,8.6L11.2,242.1c-3.1,5.3-3.1,11.9,0,17.2l114.9,199.2
- C129.2,463.8,134.9,467.1,141.1,467.1z"/>
-</svg>