From b351e60d52fb34534b87404498be01ffc34898a2 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Thu, 12 Mar 2020 07:25:24 +0100
Subject: [PATCH] Added a General tab page with XAML layout and controls
 according to spec (#1546)

---
 .../Microsoft.PowerToys.Settings.UI.csproj    |  8 ++++
 .../Strings/en-us/Resources.resw              |  6 ++-
 .../ViewModels/GeneralViewModel.cs            | 13 ++++++
 .../Views/GeneralPage.xaml                    | 45 +++++++++++++++++++
 .../Views/GeneralPage.xaml.cs                 | 29 ++++++++++++
 .../Views/ShellPage.xaml                      |  5 +++
 6 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index e32c2aa797..82b1f9c41b 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -133,11 +133,15 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\ActivationService.cs" />
     <Compile Include="Services\NavigationService.cs" />
+    <Compile Include="ViewModels\GeneralViewModel.cs" />
     <Compile Include="ViewModels\MainViewModel.cs" />
     <Compile Include="ViewModels\ShellViewModel.cs" />
     <Compile Include="ViewModels\Test1ViewModel.cs" />
     <Compile Include="ViewModels\Test2ViewModel.cs" />
     <Compile Include="ViewModels\Test3ViewModel.cs" />
+    <Compile Include="Views\GeneralPage.xaml.cs">
+      <DependentUpon>GeneralPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
@@ -212,6 +216,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\GeneralPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 6e48d8371b..229eadb097 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -141,4 +141,8 @@
     <value>Test3</value>
     <comment>Navigation view item name for Test3</comment>
   </data>
-</root>
+  <data name="Shell_General.Content" xml:space="preserve">
+    <value>General</value>
+    <comment>Navigation view item name for General</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
new file mode 100644
index 0000000000..99962c6524
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
@@ -0,0 +1,13 @@
+using System;
+
+using Microsoft.PowerToys.Settings.UI.Helpers;
+
+namespace Microsoft.PowerToys.Settings.UI.ViewModels
+{
+    public class GeneralViewModel : Observable
+    {
+        public GeneralViewModel()
+        {
+        }
+    }
+}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
new file mode 100644
index 0000000000..143b31ef29
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -0,0 +1,45 @@
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.Views.GeneralPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+        <ScrollViewer>
+            <StackPanel Orientation="Vertical" Margin="14,0,14,48">
+
+                <ToggleSwitch Header="Start at startup" IsOn="True" Margin="0,14,0,0" />
+
+                <muxc:RadioButtons Header="Theme" Margin="0, 28,0,0">
+                    <RadioButton Content="Dark"/>
+                    <RadioButton Content="Light"/>
+                    <RadioButton Content="System default" IsChecked="True"/>
+                </muxc:RadioButtons>
+
+                <ToggleSwitch Header="Disable telemetry" IsOn="True" Margin="0,14,0,0" />
+                <TextBlock Text="PowerToys currently respects the Windows data &amp; feedback setting" Opacity="0.8" Margin="0,0,0,0" />
+
+                <TextBlock Text="Default apps" Style="{StaticResource SubtitleTextBlockStyle}" Margin="0,34,0,8"/>
+                <ComboBox Header="Shell" SelectedIndex="0" MinWidth="240" Margin="0,14,0,0">
+                    <ComboBoxItem>PowerShell</ComboBoxItem>
+                </ComboBox>
+                <ComboBox Header="Terminal" SelectedIndex="0" MinWidth="240" Margin="0,14,0,0">
+                    <ComboBoxItem>Windows Console</ComboBoxItem>
+                </ComboBox>
+                <TextBlock Text="About PowerToys" Style="{StaticResource SubtitleTextBlockStyle}" Margin="0,34,0,8"/>
+                <TextBlock FontWeight="Bold" Text="Version 0.15.1.0" Margin="0,14,0,0" />
+                <Button Background="{ThemeResource SystemAccentColor}" Content="Check for updates" Margin="0,10,0,0" Foreground="White"/>
+                <!-- TO DO: The styling of this button should be improved so the hover/pressed states are representing the SystemAccentColor -->
+
+                <HyperlinkButton Content="Report a bug" Margin="0,14,0,0" />
+                <HyperlinkButton Content="Request a feature"  />
+                <HyperlinkButton Content="Privacy statement"  />
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</Page>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
new file mode 100644
index 0000000000..fc11169b10
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
@@ -0,0 +1,29 @@
+using Microsoft.PowerToys.Settings.UI.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+
+namespace Microsoft.PowerToys.Settings.UI.Views
+{
+    public sealed partial class GeneralPage : Page
+    {
+        public GeneralViewModel ViewModel { get; } = new GeneralViewModel();
+
+        public GeneralPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
index 4928a2cc84..63cddd29ff 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
@@ -47,6 +47,11 @@
             Or to use an IconElement instead of a Symbol see https://github.com/Microsoft/WindowsTemplateStudio/blob/master/docs/projectTypes/navigationpane.md
             Edit String/en-US/Resources.resw: Add a menu item title for each page
             -->
+            <winui:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
+                <winui:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE713;"/>
+                </winui:NavigationViewItem.Icon>
+            </winui:NavigationViewItem>
             <winui:NavigationViewItem x:Uid="Shell_Main" Icon="Home" helpers:NavHelper.NavigateTo="views:MainPage" />
             <winui:NavigationViewItem x:Uid="Shell_Test1" Icon="Play" helpers:NavHelper.NavigateTo="views:Test1Page" />
             <winui:NavigationViewItem x:Uid="Shell_Test2" Icon="Refresh" helpers:NavHelper.NavigateTo="views:Test2Page" />