diff --git a/Hamburger Icons.txt b/Hamburger Icons.txt deleted file mode 100644 index 2113becb..00000000 --- a/Hamburger Icons.txt +++ /dev/null @@ -1,45 +0,0 @@ -"Privacy & Telemetry" U+F103 -"UI & Personalization" U+E771 -"OneDrive" U+E754 -"System" U+E770 -"Start Menu" U+ECA5 -"UWP Apps" U+E8D9 -"Windows Game Recording" U+E7FC; -"Task Scheduler" U+E823 -"Microsoft Defender" U+E83D -"Context Menu" U+E292 - -Сменить язык U+F2B7 -Перейти на Github U+E71B -Применить U+E8FB -Сохранить U+E74E -Загрузить U+E896 - --------------------------------------- -Конфиденциальность и телеметрия -UI и персонализация -OneDrive -Система -Меню "Пуск" -UWP-приложения -Запись и трансляция игр Windows -Планировщик заданий -Microsoft Defender -Контекстное меню - - - - - - - - -Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Icon}" - - - -Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Text}" - - - - diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml b/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml index 585cda22..5f40e0a2 100644 --- a/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:W10SS_GUI.Controls" mc:Ignorable="d" - d:DesignHeight="{StaticResource toggleSwitchHeight}" d:DesignWidth="{StaticResource toggleSwitchWidth}"> + d:DesignHeight="{StaticResource toggleSwitchHeight}" d:DesignWidth="{StaticResource toggleSwitchMinWidth}"> @@ -174,28 +174,14 @@ - - - - - + - @@ -217,16 +203,14 @@ FontSize="{StaticResource fontSizeToggleSwitchHeader}" TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Header}" - MaxHeight="{StaticResource toggleSwitchHeaderMaxHeight}" - MaxWidth="{StaticResource toggleSwitchTextMaxWidth}"/> + MaxHeight="{StaticResource toggleSwitchHeaderMaxHeight}"/> diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml b/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml index 3557271d..3fd8a202 100644 --- a/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml @@ -11,7 +11,7 @@ Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Width}" Tag="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Tag}" Orientation="Vertical" - Background="{DynamicResource windowBackground}"> + Background="{DynamicResource colorWindowBackground}"> Apply Settings Save Settings Load Settings + Change Language + Follow to GitHub \ No newline at end of file diff --git a/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml b/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml index e86aba58..e151820f 100644 --- a/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml +++ b/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml @@ -12,12 +12,14 @@ Height="{StaticResource windowHeight}" Width="{StaticResource windowWidth}" FontFamily="{StaticResource fontWindow}" - FontSize="{DynamicResource windowFontSize}" TextOptions.TextFormattingMode="Display" - WindowStartupLocation="CenterScreen" SnapsToDevicePixels="True" - ResizeMode="CanResize" ShowInTaskbar="True" + FontSize="{DynamicResource windowFontSize}" + WindowStartupLocation="CenterScreen" + SnapsToDevicePixels="True" + ResizeMode="CanResize" + ShowInTaskbar="True" Background="{DynamicResource colorWindowBackground}" Foreground="{DynamicResource colorWindowForeground}" - Initialized="Window_Initialized" SizeToContent="WidthAndHeight"> + Initialized="Window_Initialized" SizeToContent="Manual"> - - - - - + - + HorizontalAlignment="Left" + Panel.ZIndex="10"> + + + @@ -149,47 +150,124 @@ Width="{Binding ElementName=panelHamburger, Path=Width}" TextMargin="0 0 10 3" Canvas.Bottom="80" Canvas.Left="0"/> - + + + + + - - + + + + + + + + + + + + + + + - + + + + + + Icon="" + Header="Do not allow apps to use advertising ID" + Description="Не разрешать приложениям использовать идентификатор рекламы"/> + Icon="" + Header="Do not let apps on other devices open and message apps on this device, and vice versa" + Description="Не разрешать приложениям на других устройствах запускать приложения и отправлять сообщения на этом устройстве и наоборот"/> + Icon="" + Header="Do not let websites provide locally relevant content by accessing language list" + Description="Не позволять веб-сайтам предоставлять местную информацию за счет доступа к списку языков"/> - + Icon="" + Header="Change Windows Feedback frequency to Never" + Description="Изменить частоту формирования отзывов на Никогда" /> + + + + + + + + + + + + + - - - diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/Animations.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/Animations.xaml index 5795e3e0..70821a2d 100644 --- a/W10SS_GUI_2/W10SS_GUI/Resource/Animations.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Resource/Animations.xaml @@ -2,12 +2,20 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:W10SS_GUI.Resource"> - - + + + + + + - + + + + + diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml index f85f1b9a..046a5a95 100644 --- a/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml @@ -2,10 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:local="clr-namespace:W10SS_GUI.Controls"> - 863 - 863 - 800 - 800 + 885 + 885 + 645 + 645 18 40 @@ -14,14 +14,16 @@ 16 40 - 220 - 220 + 200 + 200 500 40 - 20 + 26 + 34 - 550 + 550 + 1050 100 24 25 diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml index a01c11a8..0d8ac1d2 100644 --- a/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml @@ -15,4 +15,6 @@ + + \ No newline at end of file