diff --git a/W10SS_GUI_2/W10SS_GUI/App.xaml b/W10SS_GUI_2/W10SS_GUI/App.xaml index 46597a98..2675d38c 100644 --- a/W10SS_GUI_2/W10SS_GUI/App.xaml +++ b/W10SS_GUI_2/W10SS_GUI/App.xaml @@ -12,6 +12,7 @@ + diff --git a/W10SS_GUI_2/W10SS_GUI/Brushes/brushes.xaml b/W10SS_GUI_2/W10SS_GUI/Brushes/brushes.xaml index 835c3543..8f51e1e8 100644 --- a/W10SS_GUI_2/W10SS_GUI/Brushes/brushes.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Brushes/brushes.xaml @@ -3,8 +3,10 @@ + #353535 - #4A4A4A - + #4A4A4A + #e81123 + \ No newline at end of file diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml index 5fcda437..3ac31873 100644 --- a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml @@ -6,11 +6,24 @@ xmlns:local="clr-namespace:W10SS_GUI.Controls" mc:Ignorable="d" d:DesignHeight="{StaticResource buttonHamburgerHeight}" d:DesignWidth="{StaticResource panelHamburgerMaxWidth}"> + + + + Orientation="Horizontal" + Tag="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Tag}"> @@ -44,13 +57,12 @@ diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml.cs b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml.cs index 401567ae..2c7319bb 100644 --- a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml.cs +++ b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml.cs @@ -60,8 +60,5 @@ namespace W10SS_GUI.Controls public static readonly DependencyProperty TextMarginProperty = DependencyProperty.Register("TextMargin", typeof(Thickness), typeof(HamburgerCategoryButton), new PropertyMetadata(default(Thickness))); - - - } } diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml new file mode 100644 index 00000000..5e3a48c9 --- /dev/null +++ b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml.cs b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml.cs new file mode 100644 index 00000000..e5f86c56 --- /dev/null +++ b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace W10SS_GUI.Controls +{ + /// + /// Логика взаимодействия для HamburgerCategoryFlashButton.xaml + /// + public partial class HamburgerCategoryFlashButton : UserControl + { + public HamburgerCategoryFlashButton() + { + InitializeComponent(); + } + + public string Text + { + get { return (string)GetValue(TextProperty); } + set { SetValue(TextProperty, value); } + } + + // Using a DependencyProperty as the backing store for Text. This enables animation, styling, binding, etc... + public static readonly DependencyProperty TextProperty = + DependencyProperty.Register("Text", typeof(string), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(string))); + + + public string Icon + { + get { return (string)GetValue(IconProperty); } + set { SetValue(IconProperty, value); } + } + + // Using a DependencyProperty as the backing store for IconText. This enables animation, styling, binding, etc... + public static readonly DependencyProperty IconProperty = + DependencyProperty.Register("Icon", typeof(string), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(string))); + + + + public Thickness TextMargin + { + get { return (Thickness)GetValue(TextMarginProperty); } + set { SetValue(TextMarginProperty, value); } + } + + // Using a DependencyProperty as the backing store for TextMargin. This enables animation, styling, binding, etc... + public static readonly DependencyProperty TextMarginProperty = + DependencyProperty.Register("TextMargin", typeof(Thickness), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(Thickness))); + } +} diff --git a/W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml b/W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml index 455cd307..d8c4f9a8 100644 --- a/W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml @@ -1,6 +1,8 @@  + xmlns:system="clr-namespace:System;assembly=mscorlib"> + Windows 10 Setup Script + Privacy & Telemetry UI & Personalization OneDrive @@ -11,4 +13,9 @@ Task Scheduler Microsoft Defender Context Menu + + Apply Settings + Save Settings + Load Settings + \ 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 50ed7991..232ffacc 100644 --- a/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml +++ b/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml @@ -6,8 +6,11 @@ xmlns:local="clr-namespace:W10SS_GUI" xmlns:uc="clr-namespace:W10SS_GUI.Controls" mc:Ignorable="d" - Name="Window" Title="Windows 10 Setup Script" MinHeight="863" MinWidth="800" Height="863" Width="800" - FontSize="18" TextOptions.TextFormattingMode="Display" + Name="Window" Title="{StaticResource textWindowTitle}" MinHeight="{StaticResource windowMinHeight}" + Height="{StaticResource windowHeight}" + MinWidth="{StaticResource windowMinWidth}" + Width="{StaticResource windowWidth}" + FontSize="{DynamicResource windowFontSize}" TextOptions.TextFormattingMode="Display" WindowStartupLocation="CenterScreen" SnapsToDevicePixels="True" ResizeMode="CanResize" ShowInTaskbar="True" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" @@ -36,66 +39,109 @@ - - + Tag="{StaticResource tagCategoryPrivacy}" + Canvas.Top="0" Canvas.Left="0"/> - + Tag="{StaticResource tagCategoryUi}" + Canvas.Top="40" Canvas.Left="0"/> - + Tag="{StaticResource tagCategoryOneDrive}" + Canvas.Top="80" Canvas.Left="0"/> - + Tag="{StaticResource tagCategorySystem}" + Canvas.Top="120" Canvas.Left="0"/> - + Tag="{StaticResource tagCategoryStartMenu}" + Canvas.Top="160" Canvas.Left="0"/> - + Tag="{StaticResource tagCategoryUwp}" + Canvas.Top="200" Canvas.Left="0" /> + Tag="{StaticResource tagCategoryWinGame}" + Canvas.Top="240" Canvas.Left="0"/> - + Tag="{StaticResource tagCategoryTaskScheduler}" + Canvas.Top="280" Canvas.Left="0"/> - + Tag="{StaticResource tagCategoryDefender}" + Canvas.Top="320" Canvas.Left="0"/> - + Tag="{StaticResource tagCategoryContextMenu}" + Canvas.Top="360" Canvas.Left="0"/> + + + + + + + diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/Animations.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/Animations.xaml index 158ccd9d..5795e3e0 100644 --- a/W10SS_GUI_2/W10SS_GUI/Resource/Animations.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Resource/Animations.xaml @@ -1,6 +1,7 @@  + xmlns:local="clr-namespace:W10SS_GUI.Resource"> + @@ -9,4 +10,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/constants.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/constants.xaml new file mode 100644 index 00000000..9b687cb6 --- /dev/null +++ b/W10SS_GUI_2/W10SS_GUI/Resource/constants.xaml @@ -0,0 +1,15 @@ + + categoryPrivacy + categoryUi + categoryOneDrive + categorySystem + categoryStartMenu + categoryUwp + categoryWinGame + categoryTaskScheduler + categoryDefender + categoryContextMenu + \ No newline at end of file diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml index 6eafb06a..0cc6c6f8 100644 --- a/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml @@ -2,6 +2,12 @@ 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 + 18 + 40 40 20 diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml index 790e7e79..05fb6356 100644 --- a/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml +++ b/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml @@ -12,4 +12,7 @@ + + + \ No newline at end of file diff --git a/W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj b/W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj index 3aa41389..e874e03d 100644 --- a/W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj +++ b/W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj @@ -67,10 +67,18 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -98,6 +106,9 @@ HamburgerCategoryButton.xaml + + HamburgerCategoryFlashButton.xaml + MainWindow.xaml Code