From bb228c73ab61a7b518cef3885fa9978cf30403c1 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 1 Mar 2021 14:56:30 +0100
Subject: [PATCH] [Settings] UI fixes (#9949)

* Adding period to warnings

* Increased font size to default

* Fixes

* PowerLauncher display setting fix

* Added the correct brush

Co-authored-by: Niels Laute <niels9001@hotmail.com>
---
 .../Strings/en-us/Resources.resw              |  4 +-
 .../Views/PowerLauncherPage.xaml              | 37 ++++++++++---------
 .../Views/PowerPreviewPage.xaml               |  3 --
 .../Views/ShortcutGuidePage.xaml              |  3 +-
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 8339b2de8e..ec39763343 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -711,7 +711,7 @@
     <value>Administrator mode</value>
   </data>
   <data name="General_RunAsAdminRequired.Text" xml:space="preserve">
-    <value>You need to run as administrator to use this setting</value>
+    <value>You need to run as administrator to use this setting.</value>
   </data>
   <data name="ShortcutWarningLabel.Text" xml:space="preserve">
     <value>Only shortcuts with the following hotkeys are valid:</value>
@@ -783,7 +783,7 @@
     <value>Preview Pane</value>
   </data>
   <data name="FileExplorerPreview_RunAsAdminRequired.Text" xml:space="preserve">
-    <value>You need to run as administrator to modify these settings</value>
+    <value>You need to run as administrator to modify these settings.</value>
   </data>
   <data name="FileExplorerPreview_AffectsAllUsers.Text" xml:space="preserve">
     <value>The settings on this page affect all users on the system</value>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
index 810a0a1cbf..72a99ee7d2 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -170,7 +170,8 @@
                 <RadioButton x:Uid="Radio_Theme_Default"
                              IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
                              IsChecked="{Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}" />
-                <HyperlinkButton Click="OpenColorsSettings_Click">
+                <HyperlinkButton Click="OpenColorsSettings_Click"
+                                 IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
                     <TextBlock x:Uid="Windows_Color_Settings" />
                 </HyperlinkButton>
             </StackPanel>
@@ -180,12 +181,11 @@
                        Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
 
             <TextBlock x:Uid="Run_PluginUseDescription"
-                       FontSize="12"
-                       Foreground="{ThemeResource SystemBaseMediumColor}"
+                       Margin="{StaticResource SmallTopMargin}"
+                       Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
                        TextWrapping="Wrap"/>
             
             <TextBlock x:Uid="Run_AllPluginsDisabled"
-                       FontSize="12"
                        Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
                        Visibility="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
                        TextWrapping="Wrap"
@@ -218,7 +218,7 @@
                 <ListView.ItemTemplate>
                     <DataTemplate x:DataType="ViewModels:PowerLauncherPluginViewModel" x:DefaultBindMode="OneWay">
                         <StackPanel Orientation="Vertical" Background="Transparent"
-                                    Padding="0,12,0,12">
+                                    Padding="0,12,12,12">
                             <Grid ColumnSpacing="0">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="60" />
@@ -235,25 +235,23 @@
                                        Height="36" />
 
                                 <StackPanel Orientation="Vertical"
-                                            Grid.Column="1" Margin="0,0,12,0">
+                                            Grid.Column="1" Margin="0,0,16,0">
                                     <TextBlock FontSize="18"
                                                Text="{x:Bind Path=Name}"
                                                Opacity="{x:Bind DisabledOpacity}"/>
-                                    <TextBlock FontSize="12"
+                                    <TextBlock 
                                                Opacity="{x:Bind DisabledOpacity}"
                                                Foreground="{ThemeResource SystemBaseMediumColor}"
                                                Text="{x:Bind Description}"
                                                TextWrapping="Wrap"/>
                                     <TextBlock 
                                         x:Uid="Run_NotAccessibleWarning"
-                                        FontSize="12"
                                         Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
                                         Visibility="{x:Bind ShowNotAccessibleWarning, Converter={StaticResource BoolToVisibilityConverter}}"
                                         TextWrapping="Wrap" />
 
                                     <TextBlock 
                                         x:Uid="Run_NotAllowedActionKeyword"
-                                        FontSize="12"
                                         Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
                                         Visibility="{x:Bind ShowNotAllowedKeywordWarning, Converter={StaticResource BoolToVisibilityConverter}}"
                                         TextWrapping="Wrap" />
@@ -266,24 +264,28 @@
                                               Grid.Column="2" />
                             </Grid>
 
-                            <StackPanel Margin="60,24,0,24" 
+                            <StackPanel Margin="60,0,0,0" 
                                         x:Name="AdditionalInfoPanel" 
                                         Visibility="{x:Bind ShowAdditionalInfoPanel, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                                <CheckBox x:Uid="PowerLauncher_IncludeInGlobalResult"
-                                          IsChecked="{x:Bind Path=IsGlobal, Mode=TwoWay}"
-                                          IsEnabled="{x:Bind Enabled, Mode=OneWay}"/>
-
                                 <TextBlock x:Uid="PowerLauncher_ActionKeyword"
                                            x:Name="ActionKeywordHeaderTextBlock"
                                            Margin="{StaticResource SmallTopMargin}"
-                                           Opacity="{x:Bind DisabledOpacity}"/>
+                                           Opacity="{x:Bind DisabledOpacity}" />
+
                                 <TextBox x:Uid="PowerLauncher_ActionKeyword"
                                          Text="{x:Bind Path=ActionKeyword, Mode=TwoWay}"
                                          Width="86"
                                          Margin="0,6,0,0"
                                          AutomationProperties.LabeledBy="{Binding ElementName=ActionKeywordHeaderTextBlock}"
                                          HorizontalAlignment="Left"
-                                         IsEnabled="{x:Bind Enabled, Mode=OneWay}"/>
+                                         IsEnabled="{x:Bind Enabled, Mode=OneWay}" />
+                                
+                                <CheckBox x:Uid="PowerLauncher_IncludeInGlobalResult"
+                                          IsChecked="{x:Bind Path=IsGlobal, Mode=TwoWay}"
+                                          IsEnabled="{x:Bind Enabled, Mode=OneWay}"
+                                          Margin="{StaticResource SmallTopMargin}"/>
+
+
 
                                 <TextBlock x:Name="AdditionalOptionsTextBlock"
                                            x:Uid="Run_AdditionalOptions"
@@ -313,8 +315,7 @@
                                     </ListView.ItemTemplate>
                                 </ListView>
 
-                                <TextBlock FontSize="12"
-                                           Opacity="{x:Bind DisabledOpacity}"
+                                <TextBlock Opacity="{x:Bind DisabledOpacity}"
                                            Foreground="{ThemeResource SystemBaseMediumColor}"
                                            HorizontalAlignment="Right"
                                            Margin="0,0,12,0">
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
index ff65ed85cf..44f592e57e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
@@ -62,7 +62,6 @@
             <TextBlock x:Uid="FileExplorerPreview_AffectsAllUsers"
                        Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsElevated, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
                        Margin="{StaticResource SmallBottomMargin}"
-                       FontWeight="SemiBold"
                        TextWrapping="Wrap"/>
 
             <TextBlock x:Uid="FileExplorerPreview_PreviewPane_GroupSettings"
@@ -86,11 +85,9 @@
             <TextBlock x:Uid="FileExplorerPreview_RebootRequired"
                        Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsElevated, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
                        Margin="{StaticResource SmallTopBottomMargin}"
-                       FontWeight="SemiBold"
                        TextWrapping="Wrap"/>
 
             <ToggleSwitch x:Uid="FileExplorerPreview_ToggleSwitch_SVG_Thumbnail"
-                          Margin="{StaticResource SmallTopMargin}"
                           IsOn="{Binding Mode=TwoWay, Path=SVGThumbnailIsEnabled}"
                           IsEnabled="{Binding Mode=OneWay, Path=IsElevated}"/>
         </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
index 17c7d182da..3e57e2164d 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -107,7 +107,8 @@
                 <RadioButton x:Uid="Radio_Theme_Light" />
                 <RadioButton x:Uid="Radio_Theme_Default"/>
             </muxc:RadioButtons>
-            <HyperlinkButton Click="OpenColorsSettings_Click">
+            <HyperlinkButton Click="OpenColorsSettings_Click"
+                             IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                 <TextBlock x:Uid="Windows_Color_Settings" />
             </HyperlinkButton>
         </StackPanel>