Skip to content

Portable Tool for an Ideal Windows Setup

-new ui window importing

Greedeks278e998de9c0
diff --git a/.Source/GTweak/Assets/DrawingImages/Other.xaml b/.Source/GTweak/Assets/DrawingImages/Other.xaml
index d729a6be..7fad8103 100644
--- a/.Source/GTweak/Assets/DrawingImages/Other.xaml
+++ b/.Source/GTweak/Assets/DrawingImages/Other.xaml
@@ -412,4 +412,17 @@
</DrawingImage.Drawing>
</DrawingImage>
+ <DrawingImage x:Key="DI_MultiImport">
+ <DrawingImage.Drawing>
+ <DrawingGroup ClipGeometry="M0,0 V40 H40 V0 H0 Z">
+ <DrawingGroup Opacity="1">
+ <GeometryDrawing Brush="{DynamicResource Color_Accent}" Geometry="F1 M40,40z M0,0z M5,24.5C5.351562,24.5 5.648438,24.5 6,24.5 6.148438,27.449219 6.351562,30.449219 6.5,33.5 15.398438,33.5 24.300781,33.5 33.5,33.5 33.648438,30.550781 33.851562,27.550781 34,24.5 34.351562,24.5 34.648438,24.5 35,24.5 35.050781,26.050781 35.050781,27.601562 35.050781,29.199219 35.050781,29.648438 35.050781,30.101562 35.101562,30.550781 35.101562,31.199219 35.101562,31.199219 35.101562,31.851562 35.101562,32.449219 35.101562,32.449219 35.101562,33.050781 35,34 35,34 34,35 32.800781,35.148438 32.800781,35.148438 31.351562,35.148438 30.800781,35.148438 30.25,35.148438 29.648438,35.148438 29.050781,35.148438 28.449219,35.148438 27.800781,35.148438 26.851562,35.148438 26.851562,35.148438 25.949219,35.148438 24.300781,35.148438 22.648438,35.148438 21,35.148438 20,35.148438 19,35.148438 17.949219,35.148438 16,35.148438 14.101562,35.148438 12.148438,35.148438 11.550781,35.148438 10.949219,35.148438 10.300781,35.148438 9.75,35.148438 9.199219,35.148438 8.601562,35.148438 8.101562,35.148438 7.601562,35.148438 7.101562,35.148438 6,35 6,35 5,34 4.898438,33 4.898438,33 4.898438,31.800781 4.898438,31.351562 4.898438,30.949219 4.898438,30.5 4.898438,30.050781 4.898438,29.601562 4.949219,29.148438 4.949219,28.699219 4.949219,28.25 4.949219,27.800781 4.949219,26.699219 5,25.601562 5,24.5z M5,24.5" />
+ <GeometryDrawing Brush="{DynamicResource Color_Accent}" Geometry="F1 M40,40z M0,0z M32,6.699219C32.5,6.851562 33,7.050781 33.5,7.199219 32.699219,9.101562 31.449219,10.25 30,11.699219 29.449219,13.398438 29.449219,14.75 29.449219,16.550781 29.449219,17.148438 29.449219,17.75 29.449219,18.351562 29.449219,18.800781 29.449219,19.25 29.449219,19.699219 29.949219,19.199219 30.449219,18.699219 30.949219,18.199219 31.449219,18.351562 31.949219,18.550781 32.449219,18.699219 31.648438,20.601562 30.449219,21.800781 28.949219,23.199219 27.050781,22.398438 25.851562,21.199219 24.449219,19.699219 24.699219,18.949219 24.699219,18.949219 24.949219,18.199219 26.898438,19.148438 26.898438,19.148438 27.449219,19.699219 27.449219,19.148438 27.449219,18.550781 27.449219,18 27.550781,11.148438 27.550781,11.148438 29.699219,8.699219 30.648438,7.851562 30.648438,7.851562 31.449219,7.199219 31.648438,7.050781 31.851562,6.898438 32,6.699219z M32,6.699219" />
+ <GeometryDrawing Brush="{DynamicResource Color_Accent}" Geometry="F1 M40,40z M0,0z M7,6.699219C9.300781,7.800781 10.851562,8.851562 12,11.199219 12.5,14 12.5,16.851562 12.5,19.699219 13,19.199219 13.5,18.699219 14,18.199219 14.5,18.351562 15,18.550781 15.5,18.699219 14.699219,20.601562 13.5,21.800781 12,23.199219 10.101562,22.398438 8.898438,21.199219 7.5,19.699219 7.648438,19.199219 7.851562,18.699219 8,18.199219 9.949219,19.148438 9.949219,19.148438 10.5,19.699219 10.550781,18.648438 10.550781,17.648438 10.601562,16.601562 10.601562,16.050781 10.648438,15.449219 10.648438,14.851562 10.398438,11.800781 8.648438,10.199219 6.5,8.199219 6.648438,7.75 6.851562,7.25 7,6.699219z M7,6.699219" />
+ <GeometryDrawing Brush="{DynamicResource Color_Accent}" Geometry="F1 M40,40z M0,0z M19.5,7.199219C19.851562,7.199219 20.148438,7.199219 20.5,7.199219 20.648438,13.648438 20.851562,20.050781 21,26.699219 21.5,26.199219 22,25.699219 22.5,25.199219 23,25.351562 23.5,25.550781 24,25.699219 23.199219,27.601562 22,28.800781 20.5,30.199219 18.601562,29.398438 17.398438,28.199219 16,26.699219 16.148438,26.199219 16.351562,25.699219 16.5,25.199219 18.449219,26.148438 18.449219,26.148438 19,26.699219 19.148438,20.300781 19.351562,13.851562 19.5,7.199219z M19.5,7.199219" />
+ </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 f5e814be..071db361 100644
--- a/.Source/GTweak/Languages/en/Lang.xaml
+++ b/.Source/GTweak/Languages/en/Lang.xaml
@@ -90,8 +90,8 @@
<!--#endregion-->
<!--#region Import Window -->
- <v:String x:Key="title_win_import">Your tweaks are applied</v:String>
- <v:String x:Key="wait_win_import">It takes some time</v:String>
+ <v:String x:Key="title_win_import">Importing tweaks</v:String>
+ <v:String x:Key="wait_win_import">It takes some time...</v:String>
<v:String x:Key="warning_win_import">It is not necessary to close the window forcibly</v:String>
<!--#endregion-->
diff --git a/.Source/GTweak/Languages/ru/Lang.xaml b/.Source/GTweak/Languages/ru/Lang.xaml
index 4ee4dcc8..55f2d104 100644
--- a/.Source/GTweak/Languages/ru/Lang.xaml
+++ b/.Source/GTweak/Languages/ru/Lang.xaml
@@ -90,9 +90,9 @@
<!--#endregion-->
<!--#region Import Window -->
- <v:String x:Key="title_win_import">Применяются ваши твики</v:String>
- <v:String x:Key="wait_win_import">Это занимает некоторое время</v:String>
- <v:String x:Key="warning_win_import">Не стоит закрывать окно насильно</v:String>
+ <v:String x:Key="title_win_import">Импорт твиков</v:String>
+ <v:String x:Key="wait_win_import">Это занимает некоторое время...</v:String>
+ <v:String x:Key="warning_win_import">Принудительно закрывать окно нет необходимости</v:String>
<!--#endregion-->
<!--#region Reboot Window -->
diff --git a/.Source/GTweak/Windows/ImportWindow.xaml b/.Source/GTweak/Windows/ImportWindow.xaml
index d8f530f4..9acf327f 100644
--- a/.Source/GTweak/Windows/ImportWindow.xaml
+++ b/.Source/GTweak/Windows/ImportWindow.xaml
@@ -3,17 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:vm="clr-namespace:GTweak.Core.ViewModel"
xmlns:local="clr-namespace:GTweak.Windows"
mc:Ignorable="d"
Title="GTweak" WindowStyle="None"
- Height="180" Width="450" MinHeight="180" MinWidth="450" MaxHeight="200" MaxWidth="350"
+ Height="160" Width="390" MinHeight="160" MinWidth="390" MaxHeight="160" MaxWidth="390"
Background="Transparent" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Topmost="True" ResizeMode="CanMinimize"
ShowInTaskbar="False" IsTabStop="False" Loaded="Window_Loaded">
- <Window.DataContext>
- <vm:MainViewModel/>
- </Window.DataContext>
-
<Grid>
<Border Background="{StaticResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
<Border.BorderBrush>
@@ -24,54 +19,58 @@
</Border.BorderBrush>
<Grid Margin="0" Background="Transparent">
- <Grid.RowDefinitions>
- <RowDefinition Height="31*"/>
- <RowDefinition Height="141*"/>
- </Grid.RowDefinitions>
-
- <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" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
- <TextBlock.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
- </TextBlock.Effect>
- </TextBlock>
- </Border>
- </Grid>
-
- <Grid Grid.Row="1">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="19*"/>
- <ColumnDefinition Width="45*"/>
- </Grid.ColumnDefinitions>
-
- <Grid Grid.Column="0">
- <Border BorderBrush="{StaticResource Color_Accent}" BorderThickness="1.2" CornerRadius="50" Width="90" Height="90" HorizontalAlignment="Center" VerticalAlignment="Center">
- <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>
- </Grid>
-
- <Grid Grid.Column="1">
- <StackPanel Orientation="Vertical">
- <StackPanel Margin="0,10,0,0">
- <TextBlock Text="{DynamicResource title_win_import}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="15px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium"/>
- <TextBlock Text="{DynamicResource wait_win_import}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="14px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium"/>
- </StackPanel>
- <StackPanel Orientation="Vertical">
- <ProgressBar IsIndeterminate="True" Width="250" Height="10" Margin="0,25,0,0" Style="{StaticResource ProgressBarStyle}"/>
- <TextBlock Text="{DynamicResource warning_win_import}" Foreground="{StaticResource Color_Accent}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" Margin="0,20,0,0"/>
- </StackPanel>
+ <StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Center" Height="140" Margin="20,20,0,0">
+ <StackPanel Orientation="Horizontal">
+ <Image Width="25">
+ <Image.Style>
+ <Style TargetType="Image">
+ <Setter Property="Source" Value="{StaticResource DI_MultiImport}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <TextBlock Text="{DynamicResource title_win_import}" Margin="10,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="20px" HorizontalAlignment="Left" TextAlignment="Center"/>
+ </StackPanel>
+ <TextBlock Text="{DynamicResource warning_win_import}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" MaxWidth="350" FontFamily="{StaticResource Jura}" FontSize="13px" HorizontalAlignment="Left" TextAlignment="Center" Margin="0,10,0,0"/>
+ <Border Margin="0,20,0,0" CornerRadius="5" Background="{StaticResource Color_Background_RadialProgressBar}" Height="30" Width="350" HorizontalAlignment="Left">
+ <StackPanel Orientation="Horizontal">
+ <Grid Height="25" Width="25" HorizontalAlignment="Left" Margin="10,3,0,2">
+ <Path Stroke="{StaticResource Color_Background_Dark}" StrokeThickness="2" Opacity="0.5" Margin="12,12,-12,-12">
+ <Path.Data>
+ <EllipseGeometry RadiusX="12.5" RadiusY="12.5"/>
+ </Path.Data>
+ </Path>
+ <Path Stroke="{StaticResource Color_Accent}" StrokeThickness="2" Margin="12,12,-12,-12">
+ <Path.Effect>
+ <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />
+ </Path.Effect>
+ <Path.Data>
+ <PathGeometry>
+ <PathFigure StartPoint="0,-12.5">
+ <ArcSegment Point="10.6,-6.55" Size="12.5,12.5"
+ 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>
+ <TextBlock Text="{DynamicResource wait_win_import}" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="13px" HorizontalAlignment="Left" TextAlignment="Center" Margin="10,5,0,0"/>
</StackPanel>
- </Grid>
- </Grid>
+ </Border>
+ </StackPanel>
</Grid>
+
</Border>
</Grid>
</Window>
diff --git a/Assets/SVG Others/MultiImport.svg b/Assets/SVG Others/MultiImport.svg
new file mode 100644
index 00000000..23435c7e
--- /dev/null
+++ b/Assets/SVG Others/MultiImport.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 5 24.5 C 5.351562 24.5 5.648438 24.5 6 24.5 C 6.148438 27.449219 6.351562 30.449219 6.5 33.5 C 15.398438 33.5 24.300781 33.5 33.5 33.5 C 33.648438 30.550781 33.851562 27.550781 34 24.5 C 34.351562 24.5 34.648438 24.5 35 24.5 C 35.050781 26.050781 35.050781 27.601562 35.050781 29.199219 C 35.050781 29.648438 35.050781 30.101562 35.101562 30.550781 C 35.101562 31.199219 35.101562 31.199219 35.101562 31.851562 C 35.101562 32.449219 35.101562 32.449219 35.101562 33.050781 C 35 34 35 34 34 35 C 32.800781 35.148438 32.800781 35.148438 31.351562 35.148438 C 30.800781 35.148438 30.25 35.148438 29.648438 35.148438 C 29.050781 35.148438 28.449219 35.148438 27.800781 35.148438 C 26.851562 35.148438 26.851562 35.148438 25.949219 35.148438 C 24.300781 35.148438 22.648438 35.148438 21 35.148438 C 20 35.148438 19 35.148438 17.949219 35.148438 C 16 35.148438 14.101562 35.148438 12.148438 35.148438 C 11.550781 35.148438 10.949219 35.148438 10.300781 35.148438 C 9.75 35.148438 9.199219 35.148438 8.601562 35.148438 C 8.101562 35.148438 7.601562 35.148438 7.101562 35.148438 C 6 35 6 35 5 34 C 4.898438 33 4.898438 33 4.898438 31.800781 C 4.898438 31.351562 4.898438 30.949219 4.898438 30.5 C 4.898438 30.050781 4.898438 29.601562 4.949219 29.148438 C 4.949219 28.699219 4.949219 28.25 4.949219 27.800781 C 4.949219 26.699219 5 25.601562 5 24.5 Z M 5 24.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 32 6.699219 C 32.5 6.851562 33 7.050781 33.5 7.199219 C 32.699219 9.101562 31.449219 10.25 30 11.699219 C 29.449219 13.398438 29.449219 14.75 29.449219 16.550781 C 29.449219 17.148438 29.449219 17.75 29.449219 18.351562 C 29.449219 18.800781 29.449219 19.25 29.449219 19.699219 C 29.949219 19.199219 30.449219 18.699219 30.949219 18.199219 C 31.449219 18.351562 31.949219 18.550781 32.449219 18.699219 C 31.648438 20.601562 30.449219 21.800781 28.949219 23.199219 C 27.050781 22.398438 25.851562 21.199219 24.449219 19.699219 C 24.699219 18.949219 24.699219 18.949219 24.949219 18.199219 C 26.898438 19.148438 26.898438 19.148438 27.449219 19.699219 C 27.449219 19.148438 27.449219 18.550781 27.449219 18 C 27.550781 11.148438 27.550781 11.148438 29.699219 8.699219 C 30.648438 7.851562 30.648438 7.851562 31.449219 7.199219 C 31.648438 7.050781 31.851562 6.898438 32 6.699219 Z M 32 6.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 7 6.699219 C 9.300781 7.800781 10.851562 8.851562 12 11.199219 C 12.5 14 12.5 16.851562 12.5 19.699219 C 13 19.199219 13.5 18.699219 14 18.199219 C 14.5 18.351562 15 18.550781 15.5 18.699219 C 14.699219 20.601562 13.5 21.800781 12 23.199219 C 10.101562 22.398438 8.898438 21.199219 7.5 19.699219 C 7.648438 19.199219 7.851562 18.699219 8 18.199219 C 9.949219 19.148438 9.949219 19.148438 10.5 19.699219 C 10.550781 18.648438 10.550781 17.648438 10.601562 16.601562 C 10.601562 16.050781 10.648438 15.449219 10.648438 14.851562 C 10.398438 11.800781 8.648438 10.199219 6.5 8.199219 C 6.648438 7.75 6.851562 7.25 7 6.699219 Z M 7 6.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 19.5 7.199219 C 19.851562 7.199219 20.148438 7.199219 20.5 7.199219 C 20.648438 13.648438 20.851562 20.050781 21 26.699219 C 21.5 26.199219 22 25.699219 22.5 25.199219 C 23 25.351562 23.5 25.550781 24 25.699219 C 23.199219 27.601562 22 28.800781 20.5 30.199219 C 18.601562 29.398438 17.398438 28.199219 16 26.699219 C 16.148438 26.199219 16.351562 25.699219 16.5 25.199219 C 18.449219 26.148438 18.449219 26.148438 19 26.699219 C 19.148438 20.300781 19.351562 13.851562 19.5 7.199219 Z M 19.5 7.199219 "/>
+</g>
+</svg>