From b0465bb50043e108b74a46501783d3f023e030c8 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 5 Apr 2021 11:15:08 +0200
Subject: [PATCH] [OOBE] UX fixes (#10583)

* Updated OOBE

* String fix

Co-authored-by: Niels Laute <niels9001@hotmail.com>
---
 .../OOBE/Enums/PowerToysModulesEnum.cs        |  2 +-
 .../OOBE/Views/OobeOverview.xaml              |  4 ++--
 .../OOBE/Views/OobeShellPage.xaml.cs          | 24 +++++++++----------
 .../Strings/en-us/Resources.resw              |  6 ++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs
index aba36bea37..83ca42c99f 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs
@@ -12,8 +12,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Enums
         FileExplorer,
         ImageResizer,
         KBM,
-        Run,
         PowerRename,
+        Run,
         ShortcutGuide,
         VideoConference,
     }
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
index cec039d9e9..61d9aa2c9a 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
@@ -31,7 +31,7 @@
                     <Hyperlink NavigateUri="{x:Bind ViewModel.DescriptionLink}"
                                Foreground="{ThemeResource SystemControlBackgroundAccentBrush}">
                         <Run x:Uid="Oobe_Overview_DescriptionLinkText" />
-                    </Hyperlink>
+                    </Hyperlink><Run Text="." />
                 </TextBlock>
 
                 <TextBlock Margin="0,32,0,0"
@@ -39,7 +39,7 @@
                 <Run x:Uid="Oobe_Overview_CheckoutLatestVersion" />
                 <Hyperlink NavigateUri="{x:Bind ViewModel.Link}">
                     <Run x:Uid="Oobe_Overview_LatestVersionLink" />
-                </Hyperlink>
+                </Hyperlink><Run Text="." />
                 </TextBlock>
 
                 <Button Click="SettingsLaunchButton_Click"
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
index 1d0fd8c6a9..f9eb0df929 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
@@ -136,18 +136,6 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                 PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/KBM.gif",
                 Link = "https://aka.ms/PowerToysOverview_KeyboardManager",
             });
-            Modules.Insert((int)PowerToysModulesEnum.Run, new OobePowerToysModule()
-            {
-                ModuleName = loader.GetString("Oobe_Run"),
-                Tag = "Run",
-                IsNew = false,
-                Icon = "\uE773",
-                Image = "ms-appx:///Assets/Modules/PowerLauncher.png",
-                FluentIcon = "ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png",
-                PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/Run.gif",
-                Description = loader.GetString("Oobe_PowerRun_Description"),
-                Link = "https://aka.ms/PowerToysOverview_PowerToysRun",
-            });
             Modules.Insert((int)PowerToysModulesEnum.PowerRename, new OobePowerToysModule()
             {
                 ModuleName = loader.GetString("Oobe_PowerRename"),
@@ -160,6 +148,18 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                 PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/PowerRename.gif",
                 Link = "https://aka.ms/PowerToysOverview_PowerRename",
             });
+            Modules.Insert((int)PowerToysModulesEnum.Run, new OobePowerToysModule()
+            {
+                ModuleName = loader.GetString("Oobe_Run"),
+                Tag = "Run",
+                IsNew = false,
+                Icon = "\uE773",
+                Image = "ms-appx:///Assets/Modules/PowerLauncher.png",
+                FluentIcon = "ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png",
+                PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/Run.gif",
+                Description = loader.GetString("Oobe_PowerRun_Description"),
+                Link = "https://aka.ms/PowerToysOverview_PowerToysRun",
+            });
             Modules.Insert((int)PowerToysModulesEnum.ShortcutGuide, new OobePowerToysModule()
             {
                 ModuleName = loader.GetString("Oobe_ShortcutGuide"),
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 0246d81482..6638419d68 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
@@ -1031,17 +1031,17 @@
     <value>Video Conference Mute allows users to quickly mute the microphone and turn off the camera while on a conference call with a single keystroke, regardless of what application has focus on your computer.</value>
   </data>
   <data name="Oobe_Overview_CheckoutLatestVersion.Text" xml:space="preserve">
-    <value>For returning users, check out what is new on this latest version of</value>
+    <value>For returning users, check out what is new in our</value>
   </data>
   <data name="Oobe_Overview_Description.Text" xml:space="preserve">
     <value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows 10 experience for greater productivity.
 Take a moment to preview the various utilities listed or view our comprehensive documentation on</value>
   </data>
   <data name="Oobe_Overview_DescriptionLinkText.Text" xml:space="preserve">
-    <value>Microsoft Docs.</value>
+    <value>Microsoft Docs</value>
   </data>
   <data name="Oobe_Overview_LatestVersionLink.Text" xml:space="preserve">
-    <value>PowerToys in our release notes.</value>
+    <value>release notes</value>
   </data>
   <data name="Oobe_ColorPicker_HowToUse.Text" xml:space="preserve">
     <value>{Win} + {Ctrl} + {C} to open Color Picker.</value>