Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
-new design window loading & update
Greedeks3f9d472fb1d4
diff --git a/.Source/GTweak/Assets/DrawingImages/Other.xaml b/.Source/GTweak/Assets/DrawingImages/Other.xamlindex f592ca1c..d729a6be 100644--- a/.Source/GTweak/Assets/DrawingImages/Other.xaml+++ b/.Source/GTweak/Assets/DrawingImages/Other.xaml@@ -390,13 +390,26 @@<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" />+ <GeometryDrawing Brush="{DynamicResource Color_Accent}" 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_Accent}" 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_Accent}" 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_Accent}" 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>-++ <DrawingImage x:Key="DI_Log">+ <DrawingImage.Drawing>+ <DrawingGroup ClipGeometry="M0,0 V32 H32 V0 H0 Z">+ <DrawingGroup.Transform>+ <TranslateTransform X="6.9360198974609375" Y="0.12199411541223526" />+ </DrawingGroup.Transform>+ <DrawingGroup Transform="1,0,0,1,13.7265625,3.86328125">+ <GeometryDrawing Brush="{DynamicResource Color_Accent}" Geometry="F1 M32,32z M0,0z M0,0C1.12535156,0.00580078 1.12535156,0.00580078 2.2734375,0.01171875 3.02367187,0.00785156 3.77390625,0.00398437 4.546875,0 10.14682697,0.01010822 10.14682697,0.01010822 11.2734375,1.13671875 12.61670087,14.23353662 12.61670087,14.23353662 10.0625,19.75390625 7.48866563,22.66608505 5.47272078,23.93918974 1.6171875,24.57421875 -0.90828187,24.63227552 -3.23645733,24.55650659 -5.7265625,24.13671875 -7.38050367,22.48277758 -6.85655933,20.53356462 -6.859375,18.26171875 -6.86066406,17.276875 -6.86195313,16.29203125 -6.86328125,15.27734375 -6.85941406,14.2409375 -6.85554687,13.20453125 -6.8515625,12.13671875 -6.85736328,10.58210937 -6.85736328,10.58210937 -6.86328125,8.99609375 -6.86199219,8.01125 -6.86070312,7.02640625 -6.859375,6.01171875 -6.85824707,5.10164062 -6.85711914,4.1915625 -6.85595703,3.25390625 -6.58958591,-1.10452836 -3.70457058,0.00668695 0,0z M-4.7265625,2.13671875C-4.7265625,8.73671875 -4.7265625,15.33671875 -4.7265625,22.13671875 -2.4165625,22.13671875 -0.1065625,22.13671875 2.2734375,22.13671875 2.6034375,19.82671875 2.9334375,17.51671875 3.2734375,15.13671875 5.2534375,14.80671875 7.2334375,14.47671875 9.2734375,14.13671875 9.2734375,10.17671875 9.2734375,6.21671875 9.2734375,2.13671875 4.6534375,2.13671875 0.0334375,2.13671875 -4.7265625,2.13671875z M4.2734375,16.13671875C4.6034375,17.12671875 4.9334375,18.11671875 5.2734375,19.13671875 5.9334375,18.14671875 6.5934375,17.15671875 7.2734375,16.13671875 6.2834375,16.13671875 5.2934375,16.13671875 4.2734375,16.13671875z" />+ </DrawingGroup>+ </DrawingGroup>+ </DrawingImage.Drawing>+ </DrawingImage>+</ResourceDictionary>\ No newline at end of filediff --git a/.Source/GTweak/Languages/en/Lang.xaml b/.Source/GTweak/Languages/en/Lang.xamlindex adae6635..f5e814be 100644--- a/.Source/GTweak/Languages/en/Lang.xaml+++ b/.Source/GTweak/Languages/en/Lang.xaml@@ -102,10 +102,10 @@<!--#region Update Window --><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>- <v:String x:Key="download_update">Downloading the update</v:String>+ <v:String x:Key="btn_log_update">Changelog</v:String>+ <v:String x:Key="download_update">Downloading</v:String>+ <v:String x:Key="noty_update">Please wait for the download to complete</v:String><v:String x:Key="connection_update">Connecting to the server</v:String><!--#endregion-->diff --git a/.Source/GTweak/Languages/ru/Lang.xaml b/.Source/GTweak/Languages/ru/Lang.xamlindex 7d2e8ea5..4ee4dcc8 100644--- a/.Source/GTweak/Languages/ru/Lang.xaml+++ b/.Source/GTweak/Languages/ru/Lang.xaml@@ -102,10 +102,10 @@<!--#region Update Window --><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>- <v:String x:Key="download_update">Скачивания обновления</v:String>+ <v:String x:Key="btn_log_update">Изменения</v:String>+ <v:String x:Key="download_update">Скачивания</v:String>+ <v:String x:Key="noty_update">Пожалуйста, дождитесь завершения загрузки</v:String><v:String x:Key="connection_update">Подключение к серверу</v:String><!--#endregion-->diff --git a/.Source/GTweak/Styles/ProgressBar.xaml b/.Source/GTweak/Styles/ProgressBar.xamlindex d86dd744..66cc0f42 100644--- a/.Source/GTweak/Styles/ProgressBar.xaml+++ b/.Source/GTweak/Styles/ProgressBar.xaml@@ -24,14 +24,14 @@</VisualState></VisualStateGroup></VisualStateManager.VisualStateGroups>- <Border x:Name="PART_Track" CornerRadius="2" BorderThickness="1">+ <Border x:Name="PART_Track" CornerRadius="4" BorderThickness="1" Background="{StaticResource Color_Background_RadialProgressBar}"><Border.BorderBrush>- <SolidColorBrush Color="{StaticResource Color_Border_Gradient_1}" />+ <SolidColorBrush Color="Transparent" /></Border.BorderBrush></Border>- <Border x:Name="PART_Indicator" CornerRadius="1" BorderThickness="1" HorizontalAlignment="Left" Background="{TemplateBinding Foreground}">+ <Border x:Name="PART_Indicator" CornerRadius="4" BorderThickness="1" HorizontalAlignment="Left" Background="{TemplateBinding Foreground}"><Border.BorderBrush>- <SolidColorBrush Color="{StaticResource Color_Border_Gradient_1}"/>+ <SolidColorBrush Color="Transparent"/></Border.BorderBrush><Grid ClipToBounds="True" x:Name="Animation"><Rectangle x:Name="PART_GlowRect" Width="60" HorizontalAlignment="Left" Fill="{StaticResource Color_Accent}" Margin="-100,0,0,0"/>diff --git a/.Source/GTweak/Utilities/Tweaks/SystemData.cs b/.Source/GTweak/Utilities/Tweaks/SystemData.csindex bf906f03..3ff65c70 100644--- a/.Source/GTweak/Utilities/Tweaks/SystemData.cs+++ b/.Source/GTweak/Utilities/Tweaks/SystemData.cs@@ -307,6 +307,7 @@ namespace GTweak.Utilities.Tweaksinternal sealed class UtilityСonfiguration{internal static bool IsNeedUpdate = false;+ internal static string DownloadVersion = string.Empty;internal sealed class GitVersionUtility{@@ -331,7 +332,10 @@ namespace GTweak.Utilities.TweaksGitVersionUtility gitVersionUtility = JsonConvert.DeserializeObject<GitVersionUtility>(DataAsJson);if (!string.IsNullOrEmpty(gitVersionUtility.СurrentVersion) && (Assembly.GetEntryAssembly() ?? throw new InvalidOperationException()).GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion.Split(' ').Last().Trim() != gitVersionUtility.СurrentVersion)+ {IsNeedUpdate = true;+ DownloadVersion = gitVersionUtility.СurrentVersion;+ }}}diff --git a/.Source/GTweak/View/InformationSystemView.xaml b/.Source/GTweak/View/InformationSystemView.xamlindex 060e467c..1600d51c 100644--- a/.Source/GTweak/View/InformationSystemView.xaml+++ b/.Source/GTweak/View/InformationSystemView.xaml@@ -32,9 +32,9 @@<Grid Grid.Row="0"><Grid HorizontalAlignment="Left" Margin="50,20,0,0">- <Ellipse Height="90" Width="90" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="5.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.4"/>+ <Ellipse Height="90" Width="90" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="4.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.2"/>- <xrpb:RadialProgressBar x:Name="CPULoad" Value="0" Maximum="100" Width="100" Height="100" ArcWidth="5" VerticalAlignment="Center" HorizontalAlignment="Center">+ <xrpb:RadialProgressBar x:Name="CPULoad" Value="0" Maximum="100" Width="100" Height="100" 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"/>@@ -68,9 +68,9 @@</StackPanel></Grid><Grid HorizontalAlignment="Right" Margin="0,20,50,0">- <Ellipse Height="90" Width="90" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="5.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.4"/>+ <Ellipse Height="90" Width="90" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="4.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.2"/>- <xrpb:RadialProgressBar x:Name="RAMLoad" Value="0" Maximum="100" Width="100" Height="100" ArcWidth="5" VerticalAlignment="Center" HorizontalAlignment="Center" Cursor="Arrow">+ <xrpb:RadialProgressBar x:Name="RAMLoad" Value="0" Maximum="100" Width="100" Height="100" ArcWidth="4" VerticalAlignment="Center" HorizontalAlignment="Center" Cursor="Arrow"><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/.Source/GTweak/Windows/LoadingWindow.xaml b/.Source/GTweak/Windows/LoadingWindow.xamlindex a5355aa8..ebf35967 100644--- a/.Source/GTweak/Windows/LoadingWindow.xaml+++ b/.Source/GTweak/Windows/LoadingWindow.xaml@@ -7,7 +7,7 @@xmlns:local="clr-namespace:GTweak.Windows"mc:Ignorable="d"Title="GTweak" WindowStyle="None"- Height="260" Width="260"+ Height="240" Width="240"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>@@ -15,20 +15,20 @@</Window.DataContext><Grid>- <Path Stroke="{StaticResource Color_Background}" StrokeThickness="6" Margin="130,130,-130,-130" Opacity="0.5">+ <Path Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="6" Margin="120,120,-120,-120" Opacity="0.5"><Path.Data>- <EllipseGeometry RadiusX="120" RadiusY="120"/>+ <EllipseGeometry RadiusX="105" RadiusY="105"/></Path.Data></Path>- <Path Stroke="{StaticResource Color_Accent}" StrokeThickness="6" Margin="130,130,-130,-130">+ <Path Stroke="{StaticResource Color_Accent}" StrokeThickness="6" Margin="120,120,-120,-120"><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"+ <PathFigure StartPoint="0,-105">+ <ArcSegment Point="89.25,-55.02" Size="105,105"IsLargeArc="False" SweepDirection="Clockwise"/></PathFigure><PathGeometry.Transform>@@ -48,12 +48,12 @@</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"/>+ <Ellipse Height="200" Width="200" Fill="{StaticResource Color_Background}" StrokeThickness="6.6" VerticalAlignment="Center" HorizontalAlignment="Center"/>- <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,30,0,0">+ <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,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">+ <TextBlock x:Name="TextTittle" Text="{DynamicResource title0_load}" Foreground="{StaticResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="9pt" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium"><TextBlock.Triggers><EventTrigger RoutedEvent="TextBlock.Loaded"><BeginStoryboard>@@ -69,7 +69,7 @@</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 BorderBrush="{StaticResource Color_Accent}" BorderThickness="1.2" CornerRadius="50" Width="75" Height="75" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,20,0,0"><Border CornerRadius="50"><Border.Effect><DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />@@ -79,7 +79,7 @@</Border.Background></Border></Border>- <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="9pt" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" Margin="0,19,0,0"/></StackPanel></Grid></Grid>diff --git a/.Source/GTweak/Windows/RebootWindow.xaml b/.Source/GTweak/Windows/RebootWindow.xamlindex b8eb2d86..5ff2a004 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="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>+ <Ellipse Height="154" Width="154" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.5"/>- <xrpb:RadialProgressBar x:Name="RestartProgress" Value="20" Maximum="100" Width="170" Height="170" ArcWidth="4" VerticalAlignment="Center" HorizontalAlignment="Center">+ <xrpb:RadialProgressBar x:Name="RestartProgress" Value="20" Maximum="100" Width="165" Height="165" ArcWidth="5.5" 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/.Source/GTweak/Windows/UpdateWindow.xaml b/.Source/GTweak/Windows/UpdateWindow.xamlindex e77cc9cc..742f8abc 100644--- a/.Source/GTweak/Windows/UpdateWindow.xaml+++ b/.Source/GTweak/Windows/UpdateWindow.xaml@@ -6,10 +6,10 @@xmlns:local="clr-namespace:GTweak.Windows"mc:Ignorable="d"Title="GTweak" WindowStyle="None"- Height="180" Width="350" MinHeight="180" MinWidth="350" MaxHeight="200" MaxWidth="350"+ Height="180" Width="400" MinHeight="180" MinWidth="400" MaxHeight="180" MaxWidth="350"Background="Transparent" AllowsTransparency="True" WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize"IsTabStop="False" ShowInTaskbar="False" Loaded="Window_Loaded" Closing="Window_Closing">- <Grid>+ <Grid MouseDown="TitleBar_MouseDown"><Border Background="{StaticResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98"><Border.BorderBrush><LinearGradientBrush>@@ -19,70 +19,110 @@</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 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>- </TextBlock>- </Border>- </Grid>-- <Grid Grid.Row="1">+ <Grid x:Name="QuestionUpdate" Visibility="Visible">+ <Grid Margin="0" Background="Transparent">+ <Grid.RowDefinitions>+ <RowDefinition Height="31*"/>+ <RowDefinition Height="141*"/>+ </Grid.RowDefinitions>+ </Grid>- <Grid x:Name="DownloadUpdate" Visibility="Hidden">- <StackPanel Orientation="Vertical">- <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">- <TextBlock x:Name="TextTittle" Margin="0,25,0,0" Text="{DynamicResource download_update}" Foreground="{StaticResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="15px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium"/>- <TextBlock Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" FontSize="15px" Margin="10,25,0,0">- <Run Text="{Binding ElementName=ProgressDownload, Path=Value, Mode=OneWay,StringFormat=N0}"/><Run Text="%"/>- </TextBlock>- </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">+ <Grid Grid.Row="0">+ <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}">- <Setter Property="Source" Value="{StaticResource DI_Download}"/>+ <Setter Property="Source" Value="{StaticResource DI_BtnExit_In}"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding IsMouseOver, ElementName=BtnExit}" Value="true">+ <Setter Property="Source" Value="{StaticResource DI_BtnExit}"/>+ </DataTrigger>+ </Style.Triggers></Style></Image.Style></Image>- </StackPanel>+ <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 x:Name="QuestionUpdate" Visibility="Visible">- <Grid.RowDefinitions>- <RowDefinition Height="50*"/>- <RowDefinition Height="23*"/>- </Grid.RowDefinitions>-- <Grid Grid.Row="0" Margin="0,0,0,8">- <StackPanel Orientation="Vertical">- <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,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>++ <Grid Grid.Row="1">+ <StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,0,0,0">+ <StackPanel Orientation="Horizontal">+ <Image Width="25">+ <Image.Style>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource DI_Log}"/>+ </Style>+ </Image.Style>+ </Image>+ <TextBlock Text="{DynamicResource title_update}" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="18px" HorizontalAlignment="Left" TextAlignment="Center" Margin="10,0,0,0"/></StackPanel>- </Grid>-- <Grid Grid.Row="1">- <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">- <Button x:Name="BtnLater" Content="{DynamicResource btn_later_update}" Style="{StaticResource BtnDefaultM}" HorizontalAlignment="Center" VerticalAlignment="Top" Width="110" Height="30" Cursor="Hand" PreviewMouseDown="BtnLater_PreviewMouseDown"/>- <Button x:Name="BtnUpdate" Content="{DynamicResource btn_now_update}" Style="{StaticResource BtnDefault}" HorizontalAlignment="Center" VerticalAlignment="Top" Width="110" Height="30" Margin="20,0,0,0" Cursor="Hand" PreviewMouseDown="BtnUpdate_PreviewMouseDown"/>- </StackPanel>- </Grid>+ <TextBlock Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="16px" HorizontalAlignment="Left" TextAlignment="Center" Margin="0,2,0,0">+ <Run x:Name="CurrentVerison" Text="0.00.0" Foreground="{StaticResource Color_Accent}"/>+ <Run Text="➔"/>+ <Run x:Name="NewVerison" Text="0.00.0" Foreground="{StaticResource Color_Accent}"/>+ </TextBlock>+ <TextBlock Margin="0,5,0,0" Text="{DynamicResource text_update}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="370" FontFamily="{StaticResource Jura}" FontSize="14px" TextAlignment="Left" FontStretch="Medium" TextWrapping="Wrap"/>+ <Grid Margin="0,15,0,0">+ <Button x:Name="BtnLog" Content="{DynamicResource btn_log_update}" Style="{StaticResource BtnDefaultM}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="110" Height="30" Cursor="Hand" PreviewMouseDown="BtnLog_PreviewMouseDown"/>+ <Button x:Name="BtnUpdate" Content="{DynamicResource btn_now_update}" Style="{StaticResource BtnDefault}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="110" Height="30" Cursor="Hand" PreviewMouseDown="BtnUpdate_PreviewMouseDown" Margin="0,0,20,0"/>+ </Grid>+ </StackPanel></Grid>-++ </Grid>++ <Grid x:Name="DownloadUpdate" Visibility="Hidden">+ <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_Download}"/>+ </Style>+ </Image.Style>+ </Image>+ <TextBlock Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="20px" HorizontalAlignment="Center" TextAlignment="Center" Margin="10,0,0,0">+ <Run Text="{DynamicResource download_update}"/>+ <Run Text="“"/>+ <Run Text="GTweak" Foreground="{StaticResource Color_Accent}"/>+ <Run x:Name="DownloadVersion" Text="0.00.0" Foreground="{StaticResource Color_Accent}"/>+ <Run Text="”"/>+ </TextBlock>+ </StackPanel>+ <TextBlock Text="{DynamicResource noty_update}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="13px" HorizontalAlignment="Left" TextAlignment="Center" Margin="0,10,0,0"/>+ <ProgressBar x:Name="ProgressDownload" Value="0" Style="{StaticResource ProgressBarStyle}" Margin="0,25,0,0" Width="360" Height="10"/>+ <StackPanel Orientation="Horizontal">+ <TextBlock Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" FontSize="13px" Margin="0,5,0,0">+ <Run Text="{Binding ElementName=ProgressDownload, Path=Value, Mode=OneWay,StringFormat=N0}"/>+ <Run Text="% ● "/>+ <Run x:Name="SizeByte" Text="{DynamicResource connection_update}"/>+ </TextBlock>+ </StackPanel>+ </StackPanel></Grid></Grid>+</Border></Grid></Window>diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml.cs b/.Source/GTweak/Windows/UpdateWindow.xaml.csindex e03e8f13..0ed982c0 100644--- a/.Source/GTweak/Windows/UpdateWindow.xaml.cs+++ b/.Source/GTweak/Windows/UpdateWindow.xaml.cs@@ -1,8 +1,8 @@using GTweak.Utilities;-using GTweak.Utilities.Helpers;using System;using System.ComponentModel;using System.Diagnostics;+using System.Linq;using System.Net;using System.Reflection;using System.Windows;@@ -18,6 +18,8 @@ namespace GTweak.Windowspublic UpdateWindow(){InitializeComponent();+ CurrentVerison.Text = (Assembly.GetEntryAssembly() ?? throw new InvalidOperationException()).GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion.Split(' ').Last().Trim();+ DownloadVersion.Text = NewVerison.Text = Utilities.Tweaks.SystemData.UtilityСonfiguration.DownloadVersion;}private void TitleBar_MouseDown(object sender, MouseButtonEventArgs e)@@ -36,8 +38,6 @@ namespace GTweak.WindowsEasingFunction = new QuadraticEase()};Timeline.SetDesiredFrameRate(doubleAnim, 400);- BeginAnimation(OpacityProperty, doubleAnim);- new TypewriterAnimation(ViewChangelog.Text, ViewChangelog, TimeSpan.FromSeconds(0.3));}private void Window_Closing(object sender, CancelEventArgs e)@@ -50,16 +50,16 @@ namespace GTweak.WindowsBeginAnimation(OpacityProperty, doubleAnim);}- private void ViewChangelog_PreviewMouseDown(object sender, MouseButtonEventArgs e)+ private void BtnExit_PreviewMouseDown(object sender, MouseButtonEventArgs e){if (e.LeftButton == MouseButtonState.Pressed)- Process.Start("https://github.com/Greedeks/GTweak/releases/latest");+ this.Close();}- private void BtnLater_PreviewMouseDown(object sender, MouseButtonEventArgs e)+ private void BtnLog_PreviewMouseDown(object sender, MouseButtonEventArgs e){if (e.LeftButton == MouseButtonState.Pressed)- this.Close();+ Process.Start("https://github.com/Greedeks/GTweak/releases/latest");}private void BtnUpdate_PreviewMouseDown(object sender, MouseButtonEventArgs e)@@ -68,7 +68,6 @@ namespace GTweak.Windows{QuestionUpdate.Visibility = Visibility.Hidden;DownloadUpdate.Visibility = Visibility.Visible;- TitleUpdate.Text = "GTweak";try{diff --git a/Assets/SVG Others/Log.svg b/Assets/SVG Others/Log.svgnew file mode 100644index 00000000..166f37d7--- /dev/null+++ b/Assets/SVG Others/Log.svg@@ -0,0 +1,4 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32">+<path d="M0 0 C1.12535156 0.00580078 1.12535156 0.00580078 2.2734375 0.01171875 C3.02367187 0.00785156 3.77390625 0.00398437 4.546875 0 C10.14682697 0.01010822 10.14682697 0.01010822 11.2734375 1.13671875 C12.61670087 14.23353662 12.61670087 14.23353662 10.0625 19.75390625 C7.48866563 22.66608505 5.47272078 23.93918974 1.6171875 24.57421875 C-0.90828187 24.63227552 -3.23645733 24.55650659 -5.7265625 24.13671875 C-7.38050367 22.48277758 -6.85655933 20.53356462 -6.859375 18.26171875 C-6.86066406 17.276875 -6.86195313 16.29203125 -6.86328125 15.27734375 C-6.85941406 14.2409375 -6.85554687 13.20453125 -6.8515625 12.13671875 C-6.85736328 10.58210937 -6.85736328 10.58210937 -6.86328125 8.99609375 C-6.86199219 8.01125 -6.86070312 7.02640625 -6.859375 6.01171875 C-6.85824707 5.10164062 -6.85711914 4.1915625 -6.85595703 3.25390625 C-6.58958591 -1.10452836 -3.70457058 0.00668695 0 0 Z M-4.7265625 2.13671875 C-4.7265625 8.73671875 -4.7265625 15.33671875 -4.7265625 22.13671875 C-2.4165625 22.13671875 -0.1065625 22.13671875 2.2734375 22.13671875 C2.6034375 19.82671875 2.9334375 17.51671875 3.2734375 15.13671875 C5.2534375 14.80671875 7.2334375 14.47671875 9.2734375 14.13671875 C9.2734375 10.17671875 9.2734375 6.21671875 9.2734375 2.13671875 C4.6534375 2.13671875 0.0334375 2.13671875 -4.7265625 2.13671875 Z M4.2734375 16.13671875 C4.6034375 17.12671875 4.9334375 18.11671875 5.2734375 19.13671875 C5.9334375 18.14671875 6.5934375 17.15671875 7.2734375 16.13671875 C6.2834375 16.13671875 5.2934375 16.13671875 4.2734375 16.13671875 Z " fill="#303030" transform="translate(13.7265625,3.86328125)"/>+</svg>