Skip to content

Portable Tool for an Ideal Windows Setup

-redesign update window

Greedeksdaa57cfdeec0
diff --git a/.Source/GTweak/Assets/DrawingImages/Other.xaml b/.Source/GTweak/Assets/DrawingImages/Other.xaml
index b8cf2956..d81197a2 100644
--- a/.Source/GTweak/Assets/DrawingImages/Other.xaml
+++ b/.Source/GTweak/Assets/DrawingImages/Other.xaml
@@ -395,4 +395,20 @@
</DrawingImage.Drawing>
</DrawingImage>
+ <DrawingImage x:Key="DI_Download">
+ <DrawingImage.Drawing>
+ <DrawingGroup ClipGeometry="M0,0 V40 H40 V0 H0 Z">
+ <DrawingGroup.Transform>
+ <TranslateTransform X="0.1992190033197403" Y="0.31290128827095032" />
+ </DrawingGroup.Transform>
+ <DrawingGroup Opacity="1">
+ <GeometryDrawing Brush="{DynamicResource Color_TetBlock_Inactivity}" Geometry="F1 M40,40z M0,0z M21.125,0.949219C21.691406,1.285156 22.253906,1.632812 22.800781,2 23.195312,2.265625 23.59375,2.527344 24,2.800781 24.265625,2.667969 24.527344,2.535156 24.800781,2.398438 27.527344,2.097656 29.417969,2.296875 31.601562,4 32.582031,5.230469 33.164062,6.378906 33.300781,7.976562 33.265625,8.246094 33.234375,8.519531 33.199219,8.800781 33.707031,8.835938 33.707031,8.835938 34.226562,8.875 36.242188,9.351562 37.628906,10.242188 38.933594,11.859375 40.359375,14.246094 40.382812,16.902344 40,19.601562 39.140625,21.972656 37.421875,23.644531 35.199219,24.800781 33.949219,25.1875 32.824219,25.246094 31.519531,25.238281 31.125,25.238281 30.734375,25.238281 30.332031,25.234375 29.925781,25.230469 29.519531,25.226562 29.101562,25.226562 28.480469,25.222656 28.480469,25.222656 27.851562,25.21875 26.832031,25.214844 25.816406,25.207031 24.800781,25.199219 24.800781,24.671875 24.800781,24.144531 24.800781,23.601562 25.039062,23.597656 25.277344,23.59375 25.519531,23.589844 26.613281,23.566406 27.707031,23.535156 28.800781,23.5 29.171875,23.496094 29.546875,23.488281 29.933594,23.484375 32.378906,23.398438 34.378906,23.050781 36.398438,21.601562 37.964844,19.847656 38.257812,18.058594 38.152344,15.746094 37.828125,13.746094 36.796875,12.710938 35.25,11.5 34.039062,10.742188 34.039062,10.742188 32.699219,10.523438 31.601562,10 31.601562,10 31.285156,9.195312 31.082031,8.265625 30.9375,7.339844 30.800781,6.398438 30.53125,5.148438 30.53125,5.148438 29.550781,4.726562 27.699219,4.203125 26.183594,4.125 24.425781,4.949219 23.199219,5.199219 23.199219,5.199219 22.410156,4.746094 21.863281,4.324219 21.332031,3.886719 20.8125,3.429688 18.53125,1.65625 15.96875,1.675781 13.199219,2 10.339844,2.824219 8.742188,4.242188 7.222656,6.765625 6.410156,8.367188 6.390625,9.609375 6.375,11.375 6.21875,13.800781 6.21875,13.800781 5.289062,14.640625 4.425781,15.023438 4.425781,15.023438 3.5625,15.277344 2.742188,15.542969 2.742188,15.542969 2.308594,16.339844 1.820312,17.703125 1.730469,18.992188 2,20.398438 2.789062,21.808594 3.640625,22.679688 5.199219,23.199219 5.96875,23.257812 6.734375,23.300781 7.503906,23.328125 8.175781,23.351562 8.175781,23.351562 8.859375,23.378906 9.328125,23.394531 9.792969,23.410156 10.273438,23.425781 10.746094,23.441406 11.21875,23.460938 11.703125,23.476562 12.871094,23.519531 14.035156,23.5625 15.199219,23.601562 15.199219,24.128906 15.199219,24.65625 15.199219,25.199219 13.535156,25.246094 11.867188,25.273438 10.199219,25.300781 9.496094,25.320312 9.496094,25.320312 8.777344,25.339844 5.90625,25.371094 4.027344,25.167969 1.601562,23.601562 0.101562,22.101562 -0.117188,20.847656 -0.199219,18.800781 -0.128906,16.761719 0.179688,15.539062 1.601562,14 2.664062,13.035156 2.941406,12.800781 4.398438,12.800781 4.328125,12.507812 4.257812,12.21875 4.1875,11.917969 3.765625,9.394531 4.519531,7.046875 5.851562,4.898438 9.347656,0.0664062 15.683594,-1.769531 21.125,0.949219z M21.125,0.949219" />
+ <GeometryDrawing Brush="{DynamicResource Color_TetBlock_Inactivity}" Geometry="F1 M40,40z M0,0z M16,20C18.640625,20 21.28125,20 24,20 24,23.300781 24,26.601562 24,30 25.585938,30 27.167969,30 28.800781,30 28.351562,32.234375 27.953125,32.617188 26.351562,34.125 25.945312,34.507812 25.546875,34.894531 25.144531,35.28125 24.949219,35.46875 24.75,35.65625 24.550781,35.851562 23.566406,36.835938 22.707031,37.921875 21.851562,39.015625 20.976562,39.800781 20.367188,39.949219 19.199219,40 18.492188,39.539062 18.492188,39.539062 17.851562,38.824219 17.613281,38.566406 17.375,38.308594 17.128906,38.039062 16.890625,37.761719 16.648438,37.484375 16.398438,37.199219 16.164062,36.929688 15.925781,36.660156 15.683594,36.382812 15.214844,35.847656 14.746094,35.308594 14.285156,34.765625 13.628906,34.035156 12.945312,33.371094 12.226562,32.699219 11.199219,31.601562 11.199219,31.601562 11.199219,30 12.785156,30 14.367188,30 16,30 16,26.699219 16,23.398438 16,20z M17.601562,21.601562C17.46875,24.769531 17.335938,27.9375 17.199219,31.199219 15.617188,31.398438 15.617188,31.398438 14,31.601562 15.839844,33.757812 17.710938,35.886719 19.601562,38 20.933594,37.554688 21.242188,37.203125 22.125,36.148438 22.367188,35.863281 22.609375,35.578125 22.859375,35.285156 23.105469,34.992188 23.347656,34.699219 23.601562,34.398438 24.058594,33.867188 24.515625,33.332031 24.976562,32.800781 25.3125,32.402344 25.652344,32.007812 26,31.601562 24.945312,31.46875 23.886719,31.335938 22.800781,31.199219 22.601562,26.449219 22.601562,26.449219 22.398438,21.601562 20.816406,21.601562 19.230469,21.601562 17.601562,21.601562z M17.601562,21.601562" />
+ <GeometryDrawing Brush="{DynamicResource Color_TetBlock_Inactivity}" Geometry="F1 M40,40z M0,0z M12,2.800781C12.394531,2.933594 12.792969,3.0625 13.199219,3.199219 13.046875,4.175781 12.945312,4.671875 12.191406,5.335938 11.945312,5.488281 11.703125,5.644531 11.449219,5.800781 10.320312,6.550781 9.535156,7.234375 8.800781,8.398438 8.402344,8.269531 8.007812,8.136719 7.601562,8 7.792969,6.277344 8.242188,5.589844 9.574219,4.5 9.859375,4.261719 10.144531,4.027344 10.4375,3.78125 11.199219,3.199219 11.199219,3.199219 12,2.800781z M12,2.800781" />
+ <GeometryDrawing Brush="{DynamicResource Color_TetBlock_Inactivity}" Geometry="F1 M40,40z M0,0z M13.601562,2.398438C14.128906,2.398438 14.65625,2.398438 15.199219,2.398438 15.199219,2.929688 15.199219,3.457031 15.199219,4 14.671875,4 14.144531,4 13.601562,4 13.601562,3.472656 13.601562,2.945312 13.601562,2.398438z M13.601562,2.398438" />
+ </DrawingGroup>
+ </DrawingGroup>
+ </DrawingImage.Drawing>
+ </DrawingImage>
+
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Languages/en/Lang.xaml b/.Source/GTweak/Languages/en/Lang.xaml
index 81495146..059ddb29 100644
--- a/.Source/GTweak/Languages/en/Lang.xaml
+++ b/.Source/GTweak/Languages/en/Lang.xaml
@@ -100,7 +100,8 @@
<!--#endregion-->
<!--#region Update Window -->
- <v:String x:Key="text_update">A new version of the program is available. Do you want to download and update it?</v:String>
+ <v:String x:Key="title_update">An update was found</v:String>
+ <v:String x:Key="text_update">A new version of the program is available to you. Update for new features and bug fixes.</v:String>
<v:String x:Key="log_update">Сhangelog</v:String>
<v:String x:Key="btn_now_update">Update</v:String>
<v:String x:Key="btn_later_update">Later</v:String>
diff --git a/.Source/GTweak/Languages/ru/Lang.xaml b/.Source/GTweak/Languages/ru/Lang.xaml
index a5fc1957..b8d67d42 100644
--- a/.Source/GTweak/Languages/ru/Lang.xaml
+++ b/.Source/GTweak/Languages/ru/Lang.xaml
@@ -100,7 +100,8 @@
<!--#endregion-->
<!--#region Update Window -->
- <v:String x:Key="text_update">Вам доступна новая версия программы. Вы хотите загрузить и обновить ее?</v:String>
+ <v:String x:Key="title_update">Найдено обновление</v:String>
+ <v:String x:Key="text_update">Вам доступна новая версия программы. Обновите ее для получения новых функций и исправления ошибок.</v:String>
<v:String x:Key="log_update">Список изменений</v:String>
<v:String x:Key="btn_now_update">Обновиться</v:String>
<v:String x:Key="btn_later_update">Позже</v:String>
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml b/.Source/GTweak/Windows/UpdateWindow.xaml
index a56920a1..56233275 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml
@@ -8,7 +8,7 @@
Title="GTweak" WindowStyle="None"
Height="180" Width="350" MinHeight="180" MinWidth="350" MaxHeight="200" MaxWidth="350"
Background="Transparent" AllowsTransparency="True" WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize"
- IsTabStop="False" Loaded="Window_Loaded" Closing="Window_Closing">
+ IsTabStop="False" ShowInTaskbar="False" Loaded="Window_Loaded" Closing="Window_Closing">
<Grid>
<Border Background="{StaticResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
<Border.BorderBrush>
@@ -26,7 +26,7 @@
<Grid x:Name="TitleBar" Grid.Row="0" SnapsToDevicePixels="True" UseLayoutRounding="True" MouseDown="TitleBar_MouseDown">
<Border Background="{StaticResource Color_Background_Dark}" CornerRadius="9,9,0,0">
- <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{StaticResource Color_Accent}" FontSize="17px" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,5,0,0">
+ <TextBlock x:Name="TitleUpdate" FontFamily="{StaticResource Jura}" Text="{DynamicResource title_update}" Foreground="{StaticResource Color_Accent}" FontSize="17px" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,5,0,0">
<TextBlock.Effect>
<DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
</TextBlock.Effect>
@@ -46,22 +46,29 @@
</StackPanel>
<ProgressBar x:Name="ProgressDownload" Value="0" Width="250" Height="10" Margin="0,10,0,0" Style="{StaticResource ProgressBarStyle}"/>
<TextBlock x:Name="SizeByte" Text="{DynamicResource connection_update}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" Margin="0,5,0,0" FontSize="14px" TextAlignment="Center" FontStretch="Medium" TextWrapping="Wrap"/>
+ <Image Width="30" Height="auto" Margin="0,10,0,0">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}">
+ <Setter Property="Source" Value="{StaticResource DI_Download}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
</Grid>
<Grid x:Name="QuestionUpdate" Visibility="Visible">
<Grid.RowDefinitions>
- <RowDefinition Height="46*"/>
- <RowDefinition Height="27*"/>
+ <RowDefinition Height="50*"/>
+ <RowDefinition Height="23*"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0" Margin="0,0,0,8">
<StackPanel Orientation="Vertical">
- <StackPanel Margin="0,15,0,0" HorizontalAlignment="Center">
- <TextBlock Text="{DynamicResource text_update}" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="325" FontFamily="{StaticResource Jura}" FontSize="15px" TextAlignment="Center" FontStretch="Medium" TextWrapping="Wrap"/>
+ <StackPanel Margin="0,10,0,0" HorizontalAlignment="Center">
+ <TextBlock Margin="0,5,0,0" Text="{DynamicResource text_update}" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="340" FontFamily="{StaticResource Jura}" FontSize="15px" TextAlignment="Center" FontStretch="Medium" TextWrapping="Wrap"/>
</StackPanel>
- <StackPanel Orientation="Vertical" Margin="0,10,0,0">
- <TextBlock x:Name="ViewChangelog" Text="{DynamicResource log_update}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" TextDecorations="Underline" Cursor="Hand" PreviewMouseDown="ViewChangelog_PreviewMouseDown"/>
+ <StackPanel Orientation="Vertical" Margin="0,5,0,0">
+ <TextBlock x:Name="ViewChangelog" Text="{DynamicResource log_update}" Foreground="{StaticResource Color_Inactive}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" TextDecorations="Underline" Cursor="Hand" PreviewMouseDown="ViewChangelog_PreviewMouseDown"/>
</StackPanel>
</StackPanel>
</Grid>
@@ -73,7 +80,7 @@
</StackPanel>
</Grid>
</Grid>
-
+
</Grid>
</Grid>
</Border>
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml.cs b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
index dbaba0e8..84e71a26 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml.cs
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
@@ -5,6 +5,7 @@ using System.ComponentModel;
using System.Diagnostics;
using System.Net;
using System.Reflection;
+using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media.Animation;
@@ -68,6 +69,7 @@ namespace GTweak.Windows
{
QuestionUpdate.Visibility = Visibility.Hidden;
DownloadUpdate.Visibility = Visibility.Visible;
+ TitleUpdate.Text = "GTweak";
try
{
diff --git a/Assets/SVG Others/Download.svg b/Assets/SVG Others/Download.svg
new file mode 100644
index 00000000..2f4f99f2
--- /dev/null
+++ b/Assets/SVG Others/Download.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40px" height="40px" viewBox="0 0 40 40" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 21.125 0.949219 C 21.691406 1.285156 22.253906 1.632812 22.800781 2 C 23.195312 2.265625 23.59375 2.527344 24 2.800781 C 24.265625 2.667969 24.527344 2.535156 24.800781 2.398438 C 27.527344 2.097656 29.417969 2.296875 31.601562 4 C 32.582031 5.230469 33.164062 6.378906 33.300781 7.976562 C 33.265625 8.246094 33.234375 8.519531 33.199219 8.800781 C 33.707031 8.835938 33.707031 8.835938 34.226562 8.875 C 36.242188 9.351562 37.628906 10.242188 38.933594 11.859375 C 40.359375 14.246094 40.382812 16.902344 40 19.601562 C 39.140625 21.972656 37.421875 23.644531 35.199219 24.800781 C 33.949219 25.1875 32.824219 25.246094 31.519531 25.238281 C 31.125 25.238281 30.734375 25.238281 30.332031 25.234375 C 29.925781 25.230469 29.519531 25.226562 29.101562 25.226562 C 28.480469 25.222656 28.480469 25.222656 27.851562 25.21875 C 26.832031 25.214844 25.816406 25.207031 24.800781 25.199219 C 24.800781 24.671875 24.800781 24.144531 24.800781 23.601562 C 25.039062 23.597656 25.277344 23.59375 25.519531 23.589844 C 26.613281 23.566406 27.707031 23.535156 28.800781 23.5 C 29.171875 23.496094 29.546875 23.488281 29.933594 23.484375 C 32.378906 23.398438 34.378906 23.050781 36.398438 21.601562 C 37.964844 19.847656 38.257812 18.058594 38.152344 15.746094 C 37.828125 13.746094 36.796875 12.710938 35.25 11.5 C 34.039062 10.742188 34.039062 10.742188 32.699219 10.523438 C 31.601562 10 31.601562 10 31.285156 9.195312 C 31.082031 8.265625 30.9375 7.339844 30.800781 6.398438 C 30.53125 5.148438 30.53125 5.148438 29.550781 4.726562 C 27.699219 4.203125 26.183594 4.125 24.425781 4.949219 C 23.199219 5.199219 23.199219 5.199219 22.410156 4.746094 C 21.863281 4.324219 21.332031 3.886719 20.8125 3.429688 C 18.53125 1.65625 15.96875 1.675781 13.199219 2 C 10.339844 2.824219 8.742188 4.242188 7.222656 6.765625 C 6.410156 8.367188 6.390625 9.609375 6.375 11.375 C 6.21875 13.800781 6.21875 13.800781 5.289062 14.640625 C 4.425781 15.023438 4.425781 15.023438 3.5625 15.277344 C 2.742188 15.542969 2.742188 15.542969 2.308594 16.339844 C 1.820312 17.703125 1.730469 18.992188 2 20.398438 C 2.789062 21.808594 3.640625 22.679688 5.199219 23.199219 C 5.96875 23.257812 6.734375 23.300781 7.503906 23.328125 C 8.175781 23.351562 8.175781 23.351562 8.859375 23.378906 C 9.328125 23.394531 9.792969 23.410156 10.273438 23.425781 C 10.746094 23.441406 11.21875 23.460938 11.703125 23.476562 C 12.871094 23.519531 14.035156 23.5625 15.199219 23.601562 C 15.199219 24.128906 15.199219 24.65625 15.199219 25.199219 C 13.535156 25.246094 11.867188 25.273438 10.199219 25.300781 C 9.496094 25.320312 9.496094 25.320312 8.777344 25.339844 C 5.90625 25.371094 4.027344 25.167969 1.601562 23.601562 C 0.101562 22.101562 -0.117188 20.847656 -0.199219 18.800781 C -0.128906 16.761719 0.179688 15.539062 1.601562 14 C 2.664062 13.035156 2.941406 12.800781 4.398438 12.800781 C 4.328125 12.507812 4.257812 12.21875 4.1875 11.917969 C 3.765625 9.394531 4.519531 7.046875 5.851562 4.898438 C 9.347656 0.0664062 15.683594 -1.769531 21.125 0.949219 Z M 21.125 0.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 16 20 C 18.640625 20 21.28125 20 24 20 C 24 23.300781 24 26.601562 24 30 C 25.585938 30 27.167969 30 28.800781 30 C 28.351562 32.234375 27.953125 32.617188 26.351562 34.125 C 25.945312 34.507812 25.546875 34.894531 25.144531 35.28125 C 24.949219 35.46875 24.75 35.65625 24.550781 35.851562 C 23.566406 36.835938 22.707031 37.921875 21.851562 39.015625 C 20.976562 39.800781 20.367188 39.949219 19.199219 40 C 18.492188 39.539062 18.492188 39.539062 17.851562 38.824219 C 17.613281 38.566406 17.375 38.308594 17.128906 38.039062 C 16.890625 37.761719 16.648438 37.484375 16.398438 37.199219 C 16.164062 36.929688 15.925781 36.660156 15.683594 36.382812 C 15.214844 35.847656 14.746094 35.308594 14.285156 34.765625 C 13.628906 34.035156 12.945312 33.371094 12.226562 32.699219 C 11.199219 31.601562 11.199219 31.601562 11.199219 30 C 12.785156 30 14.367188 30 16 30 C 16 26.699219 16 23.398438 16 20 Z M 17.601562 21.601562 C 17.46875 24.769531 17.335938 27.9375 17.199219 31.199219 C 15.617188 31.398438 15.617188 31.398438 14 31.601562 C 15.839844 33.757812 17.710938 35.886719 19.601562 38 C 20.933594 37.554688 21.242188 37.203125 22.125 36.148438 C 22.367188 35.863281 22.609375 35.578125 22.859375 35.285156 C 23.105469 34.992188 23.347656 34.699219 23.601562 34.398438 C 24.058594 33.867188 24.515625 33.332031 24.976562 32.800781 C 25.3125 32.402344 25.652344 32.007812 26 31.601562 C 24.945312 31.46875 23.886719 31.335938 22.800781 31.199219 C 22.601562 26.449219 22.601562 26.449219 22.398438 21.601562 C 20.816406 21.601562 19.230469 21.601562 17.601562 21.601562 Z M 17.601562 21.601562 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 12 2.800781 C 12.394531 2.933594 12.792969 3.0625 13.199219 3.199219 C 13.046875 4.175781 12.945312 4.671875 12.191406 5.335938 C 11.945312 5.488281 11.703125 5.644531 11.449219 5.800781 C 10.320312 6.550781 9.535156 7.234375 8.800781 8.398438 C 8.402344 8.269531 8.007812 8.136719 7.601562 8 C 7.792969 6.277344 8.242188 5.589844 9.574219 4.5 C 9.859375 4.261719 10.144531 4.027344 10.4375 3.78125 C 11.199219 3.199219 11.199219 3.199219 12 2.800781 Z M 12 2.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 13.601562 2.398438 C 14.128906 2.398438 14.65625 2.398438 15.199219 2.398438 C 15.199219 2.929688 15.199219 3.457031 15.199219 4 C 14.671875 4 14.144531 4 13.601562 4 C 13.601562 3.472656 13.601562 2.945312 13.601562 2.398438 Z M 13.601562 2.398438 "/>
+</g>
+</svg>