Merge branch 'dev/build-features' into merge/build-features-to-master-05062020

PowerToys.sln

@@ -244,6 +244,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "interop-tests", "src\common
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder\Microsoft.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher.Telemetry", "src\modules\launcher\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj", "{08C8C05F-0362-41BC-818C-724572DF8B06}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telemetry", "src\common\ManagedTelemetry\Telemetry\Telemetry.csproj", "{5D00D290-4016-4CFE-9E41-1E7C724509BA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -868,6 +872,38 @@ Global
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.ActiveCfg = Release|x64
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.Build.0 = Release|x64
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x86.ActiveCfg = Release|x64
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|ARM.Build.0 = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|x64.Build.0 = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Debug|x86.Build.0 = Debug|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|ARM.ActiveCfg = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|ARM.Build.0 = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|ARM64.Build.0 = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x64.ActiveCfg = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x64.Build.0 = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x86.ActiveCfg = Release|Any CPU
+		{08C8C05F-0362-41BC-818C-724572DF8B06}.Release|x86.Build.0 = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|ARM.Build.0 = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|ARM64.Build.0 = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|x64.Build.0 = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -935,6 +971,8 @@ Global
 		{985B3F2F-CEED-4C0A-A249-69257E719145} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{437AD818-3F1F-4CA5-A79B-25233A157026} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{08C8C05F-0362-41BC-818C-724572DF8B06} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
+		{5D00D290-4016-4CFE-9E41-1E7C724509BA} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Tracing;
+using PreviewHandlerCommon.Telemetry;
+
+namespace Microsoft.PowerToys.Telemetry
+{
+    /// <summary>
+    /// Telemetry helper class for PowerToys.
+    /// </summary>
+    public class PowerToysTelemetry : TelemetryBase
+    {
+
+        /// <summary>
+        /// Name for ETW event.
+        /// </summary>
+        private const string EventSourceName = "Microsoft.PowerToys";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PowerToysTelemetry"/> class.
+        /// </summary>
+        public PowerToysTelemetry()
+            : base(EventSourceName)
+        {
+        }
+
+        /// <summary>
+        /// Gets an instance of the <see cref="PowerLauncherTelemetry"/> class.
+        /// </summary>
+        public static PowerToysTelemetry Log = new PowerToysTelemetry();
+
+        /// <summary>
+        /// Publishes ETW event when an action is triggered on 
+        /// </summary>
+        public void WriteEvent<T>(T telemetryEvent) 
+        {
+            this.Write<T>(null, new EventSourceOptions()
+            {
+                Keywords = ProjectKeywordMeasure,
+                Tags = ProjectTelemetryTagProductAndServicePerformance,
+            },
+            telemetryEvent);
+        }
+    }
+}

src/common/ManagedTelemetry/Telemetry/Telemetry.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\Telemetry\TelemetryBase.cs" Link="TelemetryBase.cs" />
+  </ItemGroup>
+
+</Project>

src/common/Telemetry/TelemetryBase.cs

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Eventing.Reader;
 using System.Diagnostics.Tracing;
 
 namespace PreviewHandlerCommon.Telemetry

src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs

@@ -2,8 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Microsoft.PowerToys.Settings.Telemetry;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerToys.Settings.UI.Lib
 {
@@ -11,37 +14,131 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
     {
         public EnabledModules()
         {
-            this.FancyZones = false;
-            this.ImageResizer = false;
-            this.FileExplorerPreview = false;
-            this.PowerRename = false;
-            this.ShortcutGuide = false;
-            this.PowerLauncher = true;
         }
 
+        private bool fancyZones = true;
+
         [JsonPropertyName("FancyZones")]
-        public bool FancyZones { get; set; }
+        public bool FancyZones
+        {
+            get => this.fancyZones;
+            set
+            {
+                if (this.fancyZones != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.fancyZones = value;
+                }
+            }
+        }
+
+        private bool imageResizer = true;
 
         [JsonPropertyName("Image Resizer")]
-        public bool ImageResizer { get; set; }
+        public bool ImageResizer
+        {
+            get => this.imageResizer;
+            set
+            {
+                if (this.imageResizer != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.imageResizer = value;
+                }
+            }
+        }
+
+        private bool fileExplorerPreview = true;
 
         [JsonPropertyName("File Explorer Preview")]
-        public bool FileExplorerPreview { get; set; }
+        public bool FileExplorerPreview
+        {
+            get => this.fileExplorerPreview;
+            set
+            {
+                if (this.fileExplorerPreview != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.fileExplorerPreview = value;
+                }
+            }
+        }
+
+        private bool shortcutGuide = true;
 
         [JsonPropertyName("Shortcut Guide")]
-        public bool ShortcutGuide { get; set; }
+        public bool ShortcutGuide
+        {
+            get => this.shortcutGuide;
+            set
+            {
+                if (this.shortcutGuide != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.shortcutGuide = value;
+                }
+            }
+        }
 
-        public bool PowerRename { get; set; }
+        private bool powerRename = true;
 
+        public bool PowerRename
+        {
+            get => this.powerRename;
+            set
+            {
+                if (this.powerRename != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.powerRename = value;
+                }
+            }
+        }
+
+        private bool keyboardManager = true;
         [JsonPropertyName("Keyboard Manager")]
-        public bool KeyboardManager { get; set; }
+        public bool KeyboardManager
+        {
+            get => this.keyboardManager;
+            set
+            {
+                if (this.keyboardManager != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.keyboardManager = value;
+                }
+            }
+        }
+
+        private bool powerLauncher = true;
 
      	[JsonPropertyName("Run")]
-        public bool PowerLauncher { get; set; }
+        public bool PowerLauncher
+        {
+            get => this.powerLauncher;
+            set
+            {
+                if (this.powerLauncher != value)
+                {
+                    LogTelemetryEvent(value);
+                    this.powerLauncher = value;
+                }
+            }
+}
 
         public string ToJsonString()
         {
             return JsonSerializer.Serialize(this);
         }
+
+        private void LogTelemetryEvent(bool value, [CallerMemberName] string moduleName = null )
+        {
+            var dataEvent = new SettingsEnabledModuleEvent()
+            {
+                Value = value,
+                ModuleName = moduleName,
+            };
+            PowerToysTelemetry.Log.WriteEvent(dataEvent);
+        }
     }
 }

src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj

@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\common\interop\interop.vcxproj" />
+    <ProjectReference Include="..\..\common\ManagedTelemetry\Telemetry\Telemetry.csproj" />
   </ItemGroup>
 
 </Project>

src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledModuleEvent.cs

@@ -0,0 +1,12 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerToys.Settings.Telemetry
+{
+    [EventData]
+    public class SettingsEnabledModuleEvent
+    {
+        public string ModuleName { get; set; }
+
+        public bool Value { get; set; }
+    }
+}

src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs

@@ -29,7 +29,8 @@ namespace Microsoft.PowerToys.Settings.UI.Runner
                 // send IPC Message
                 shellPage.SetDefaultSndMessageCallback(msg =>
                 {
-                    Program.GetTwoWayIPCManager().Send(msg);
+                    //IPC Manager is null when launching runner directly
+                    Program.GetTwoWayIPCManager()?.Send(msg);
                 });
 
                 // send IPC Message

src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw

@@ -314,10 +314,10 @@
   <data name="FancyZones_ZoneSetChangeMoveWindows.Content" xml:space="preserve">
     <value>During zone layout changes, windows assigned to a zone will match new size/positions</value>
   </data>
-  <data name="Give_Feedback.Content" xml:space="preserve">
+  <data name="Give_Feedback.Text" xml:space="preserve">
     <value>Give feedback</value>
   </data>
-  <data name="Module_overview.Content" xml:space="preserve">
+  <data name="Module_overview.Text" xml:space="preserve">
     <value>Module overview</value>
   </data>
   <data name="AttributionTitle.Text" xml:space="preserve">
@@ -329,7 +329,7 @@
   <data name="GeneralPage_CheckForUpdates.Content" xml:space="preserve">
     <value>Check for updates</value>
   </data>
-  <data name="GeneralPage_PrivacyStatement_URL.Content" xml:space="preserve">
+  <data name="GeneralPage_PrivacyStatement_URL.Text" xml:space="preserve">
     <value>Privacy statement</value>
   </data>
   <data name="GeneralPage_Radio_Theme_Dark.Content" xml:space="preserve">
@@ -341,10 +341,10 @@
   <data name="GeneralPage_Radio_Theme_Light.Content" xml:space="preserve">
     <value>Light</value>
   </data>
-  <data name="GeneralPage_ReportAbug.Content" xml:space="preserve">
+  <data name="GeneralPage_ReportAbug.Text" xml:space="preserve">
     <value>Report a bug</value>
   </data>
-  <data name="GeneralPage_RequestAFeature_URL.Content" xml:space="preserve">
+  <data name="GeneralPage_RequestAFeature_URL.Text" xml:space="preserve">
     <value>Request a feature</value>
   </data>
   <data name="GeneralPage_RestartAsAdmin_Button.Content" xml:space="preserve">
@@ -392,7 +392,7 @@
   <data name="Miscellaneous.Text" xml:space="preserve">
     <value>Miscellaneous</value>
   </data>
-  <data name="OpenSource_Notice.Content" xml:space="preserve">
+  <data name="OpenSource_Notice.Text" xml:space="preserve">
     <value>Open-source notice</value>
   </data>
   <data name="PowerRename_Toggle_AutoComplete.Header" xml:space="preserve">
@@ -431,9 +431,6 @@
   <data name="ImageResizer_Description.Text" xml:space="preserve">
     <value>Lets you resize images by right-clicking.</value>
   </data>
-  <data name="ImageResizer_EnableGroupSettingsHeader.Text" xml:space="preserve">
-    <value>Enable</value>
-  </data>
   <data name="ImageResizer_EnableToggle.Header" xml:space="preserve">
     <value>Enable Image Resizer</value>
   </data>
@@ -527,7 +524,7 @@
   <data name="GeneralPage_ToggleSwitch_AlwaysRunElevated.Header" xml:space="preserve">
     <value>Always Run as Admin</value>
   </data>
-  <data name="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link.Content" xml:space="preserve">
+  <data name="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link.Text" xml:space="preserve">
     <value>Learn about Admin mode</value>
   </data>
   <data name="GeneralPage_ToggleSwitch_AutoDownloadUpdates.Header" xml:space="preserve">

src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml

@@ -53,7 +53,7 @@
 
             <ToggleSwitch x:Uid="FancyZones_EnableToggleControl_HeaderText"
                           IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}"
-                          Margin="{StaticResource SmallTopMargin}" />
+                          Margin="{StaticResource MediumTopMargin}" />
 
             <TextBlock x:Uid="FancyZones_ZoneBehavior_GroupSettings"
                        Style="{StaticResource SettingsGroupTitleStyle}"
@@ -228,10 +228,13 @@
             
             <Image Source="https://user-images.githubusercontent.com/9866362/77859136-f04ae880-7207-11ea-8a7f-4295342fe319.gif" />
 
-            <HyperlinkButton x:Uid="Module_overview"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/fancyzones/README.md">
-                             NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/fancyzones/README.md"/>
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="Give_Feedback" NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
 
             <!--
             <TextBlock Text="Contributors"

src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml

@@ -115,21 +115,26 @@
                     Command = "{Binding CheckFoUpdatesEventHandler, Source={StaticResource eventViewModel}}"
                     />
 
-            <HyperlinkButton x:Uid="GeneralPage_ReportAbug"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues"
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"
+                             Margin="{StaticResource SmallTopMargin}">
-                             Margin="{StaticResource SmallTopMargin}" />
+                <TextBlock x:Uid="GeneralPage_ReportAbug"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="GeneralPage_RequestAFeature_URL" 
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+                <TextBlock x:Uid="GeneralPage_RequestAFeature_URL"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="GeneralPage_PrivacyStatement_URL"
+            <HyperlinkButton NavigateUri=" http://go.microsoft.com/fwlink/?LinkId=521839">
-                             NavigateUri=" http://go.microsoft.com/fwlink/?LinkId=521839" />
+                <TextBlock x:Uid="GeneralPage_PrivacyStatement_URL"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="OpenSource_Notice"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md">
-                             NavigateUri="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md"/>
+                <TextBlock x:Uid="OpenSource_Notice"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/doc/devdocs/run-as-admin-detection.md">
-                             NavigateUri="https://github.com/microsoft/PowerToys/blob/master/doc/devdocs/run-as-admin-detection.md"/>
+                <TextBlock x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>

src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml

@@ -50,12 +50,9 @@
             <TextBlock x:Uid="ImageResizer_Description"
                        TextWrapping="Wrap"/>
 
-            <TextBlock x:Uid="ImageResizer_EnableGroupSettingsHeader"
+            <ToggleSwitch x:Uid="ImageResizer_EnableToggle"
-                       Style="{StaticResource SettingsGroupTitleStyle}"/>
+                          Margin="{StaticResource MediumTopMargin}"
-
+                          IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"/>
-            <!--x:Uid="ImageResizer_EnableToggle"-->
-            <ToggleSwitch IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
-                          Margin="{StaticResource SmallTopMargin}" />
 
             <TextBlock x:Uid="ImageResizer_CustomSizes"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
@@ -66,7 +63,7 @@
                       Padding="0"
                       IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
                       Margin="0"
-                      >
+                      SelectionMode="None">
 
                 <ListView.ItemContainerStyle>
                     <Style TargetType="ListViewItem">
@@ -100,15 +97,17 @@
                 </ListView.ItemContainerStyle>
                 <ListView.ItemTemplate>
                     <DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize" >
-                        <StackPanel Orientation="Horizontal" Padding="0" Spacing="4">
+                        <StackPanel Orientation="Horizontal" Height="48" Padding="0" Spacing="4">
                             <TextBox Text="{x:Bind Path=Name, Mode=TwoWay}" 
                                      Width="90"
-                                     Height="35" 
+                                     VerticalAlignment="Center"
+                                     Height="34"
                                      Margin="{StaticResource SmallTopMargin}"/>
 
                             <ComboBox SelectedIndex="{x:Bind Path=Fit, Mode=TwoWay}"
                                       Width="90"
-                                      Height="35"
+                                      VerticalAlignment="Center"
+                                      Height="34"
                                       Margin="{StaticResource SmallTopMargin}">
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fill" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fit" />
@@ -118,37 +117,42 @@
                             <muxc:NumberBox Value="{x:Bind Path=Width, Mode=TwoWay}" 
                                             Width="68"
                                             Height="34"
+                                            VerticalAlignment="Center"
                                             Margin="{StaticResource SmallTopMargin}"/>
 
-                            <TextBlock Text="x" 
+                            <TextBlock Text="&#xE711;"
-                                       FontWeight="SemiBold" 
+                                       FontFamily="Segoe MDL2 Assets"
                                        TextAlignment="Center"
+                                       VerticalAlignment="Center"
                                        Margin="{StaticResource SmallTopMargin}" 
-                                       Width="25" 
+                                       Width="25"/>
-                                       Height="35"/>
 
                             <muxc:NumberBox Value="{x:Bind Path=Height, Mode=TwoWay}" 
                                             Width="68"
                                             Height="34"
+                                            VerticalAlignment="Center"
                                             Margin="{StaticResource SmallTopMargin}"/>
 
                             <ComboBox SelectedIndex="{Binding Path=Unit, Mode=TwoWay}"
                                       Width="90"
-                                      Height="35"
+                                      Height="34"
+                                      VerticalAlignment="Center"
                                       Margin="{StaticResource SmallTopMargin}">
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_CM" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Inches" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Percent" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Pixels" />
                             </ComboBox>
-                            <AppBarButton x:Name="RemoveButton" 
+                            <Button x:Name="RemoveButton" 
                                           Background="Transparent" 
                                           Command = "{Binding DeleteImageSizeEventHandler, Source={StaticResource ViewModel}}"
                                           CommandParameter="{Binding Id}"                                          
-                                          Icon="Delete" 
+                                          FontFamily="Segoe MDL2 Assets"
-                                          Width="52" 
+                                          Height="34"
-                                          Height="32"
+                                          Width="34"
-                                          Margin="{StaticResource SmallTopMargin}" Padding="0,0,50,100" UseLayoutRounding="False"/>
+                                          Content="&#xE74D;"
+                                          VerticalAlignment="Center"
+                                          Margin="{StaticResource SmallTopMargin}" UseLayoutRounding="False"/>
                         </StackPanel>
                     </DataTemplate>
                 </ListView.ItemTemplate>
@@ -272,21 +276,22 @@
                 Style="{StaticResource SettingsGroupTitleStyle}"
                 Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton 
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/imageresizer/README.md">
-                x:Uid="Module_overview"
+                <TextBlock x:Uid="Module_overview" />
-                NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/imageresizer/README.md"/>
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="Give_Feedback"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
 
             <TextBlock 
                 x:Uid="AttributionTitle"
                 Style="{StaticResource SettingsGroupTitleStyle}" />
 
             <HyperlinkButton 
-                Content="Brice Lambson" 
+                NavigateUri="https://github.com/bricelam/ImageResizer/">
-                NavigateUri="https://github.com/bricelam/ImageResizer/" />
+                <TextBlock Text="Brice Lambson's SmartRenamer" TextWrapping="Wrap" />
-
+            </HyperlinkButton>
         </StackPanel>
 
     </Grid>

src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml

@@ -121,7 +121,7 @@
 
             <ToggleSwitch x:Uid="KeyboardManager_EnableToggle"
                           IsOn="{x:Bind Path=ViewModel.Enabled, Mode=TwoWay}"
-                          Margin="{StaticResource SmallTopMargin}" />
+                          Margin="{StaticResource MediumTopMargin}" />
 
             <!--<TextBlock x:Uid="KeyboardManager_ConfigHeader"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
@@ -139,13 +139,13 @@
             <TextBlock x:Uid="KeyboardManager_RemapKeyboardHeader"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
-            <TextBlock Text="Description of the Remap Keyboard (subfeature)"
+            <TextBlock Text="Click below to remap a single key to another key"
                        Margin="{StaticResource SmallTopMargin}"
                        TextWrapping="Wrap"/>
 
             <Button x:Uid="KeyboardManager_RemapKeyboardButton"
                     Margin="{StaticResource SmallTopMargin}"
-                    Style="{StaticResource ButtonRevealStyle}"
+                    Style="{StaticResource AccentButtonStyle}"
                     Command="{Binding Path=RemapKeyboardCommand}"
                     IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"/>
 
@@ -169,12 +169,12 @@
             <TextBlock x:Uid="KeyboardManager_RemapShortcutsHeader"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
-            <TextBlock Text="Description of the Remap Shortcuts (subfeature)"
+            <TextBlock Text="Click below to remap a shortcut (hotkey) to another shortcut"
                        TextWrapping="Wrap" Margin="{StaticResource SmallTopMargin}"/>
 
             <Button x:Uid="KeyboardManager_RemapShortcutsButton"
                     Margin="{StaticResource SmallTopMargin}"
-                    Style="{StaticResource ButtonRevealStyle}"
+                    Style="{StaticResource AccentButtonStyle}"
                     Command="{Binding Path=EditShortcutCommand}"
                     IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"
                     />
@@ -208,7 +208,13 @@
                 Style="{StaticResource SettingsGroupTitleStyle}"
                 Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton Content="Module overview"/>
+            <HyperlinkButton>
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
+
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>

src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml

@@ -44,12 +44,11 @@
 
         <StackPanel Orientation="Vertical">
             <TextBlock x:Uid="PowerLauncher_Description"
-                       Style="{StaticResource BodyTextBlockStyle}"
                        TextWrapping="Wrap"/>
 
             <ToggleSwitch x:Uid="PowerLauncher_EnablePowerLauncher" 
                           IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.EnablePowerLauncher}"
-                          Margin="{StaticResource SmallTopMargin}"/>
+                          Margin="{StaticResource MediumTopMargin}"/>
 
             <TextBlock x:Uid="PowerLauncher_SearchResults"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
@@ -141,19 +140,25 @@
                 Style="{StaticResource SettingsGroupTitleStyle}"
                 Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton Content="Module overview"/>
+            <HyperlinkButton>
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
+
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
 
             <TextBlock 
                 Text="Attribution"
                 Style="{StaticResource SettingsGroupTitleStyle}" />
 
-            <HyperlinkButton 
+            <HyperlinkButton NavigateUri="https://github.com/Wox-launcher/Wox/">
-                Content="Wox" 
+                <TextBlock Text="Wox"/>
-                NavigateUri="https://github.com/Wox-launcher/Wox/" />
+            </HyperlinkButton>
 
-            <HyperlinkButton 
+            <HyperlinkButton NavigateUri="https://github.com/betsegaw/windowwalker/">
-                Content="Beta Tadele's Window Walker" 
+                <TextBlock Text="Beta Tadele's Window Walker" />
-                NavigateUri="https://github.com/betsegaw/windowwalker/" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>

src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml

@@ -45,7 +45,7 @@
                        TextWrapping="Wrap"/>
 
             <ToggleSwitch x:Uid="FileEplorerPreview_ToggleSwitch_Preview_SVG"
-                          Margin="{StaticResource SmallTopMargin}"
+                          Margin="{StaticResource MediumTopMargin}"
                           IsOn="{Binding Mode=TwoWay, Path=SVGRenderIsEnabled}" />
 
             <ToggleSwitch x:Uid="FileEplorerPreview_ToggleSwitch_Preview_MD"
@@ -63,11 +63,13 @@
                        Style="{StaticResource SettingsGroupTitleStyle}"
                        Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton x:Uid="Module_overview"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/previewpane">
-                             NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/previewpane"/>
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="Give_Feedback"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>

src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml

@@ -46,7 +46,7 @@
                        TextWrapping="Wrap"/>
 
             <ToggleSwitch x:Uid="PowerRename_Toggle_Enable"
-                          Margin="{StaticResource SmallTopMargin}" 
+                          Margin="{StaticResource MediumTopMargin}" 
                           IsOn="{Binding Mode=TwoWay, Path=IsEnabled}"                          
                            />
 
@@ -74,6 +74,13 @@
             <TextBlock x:Uid="Miscellaneous" 
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
+
+            <ToggleSwitch x:Uid="PowerRename_Toggle_AutoComplete"
+                          Margin="{StaticResource SmallTopMargin}" 
+                          IsOn="{Binding Mode=TwoWay, Path=MRUEnabled}"
+                          IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"
+                           />
+            
             <ToggleSwitch x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch"
                           Margin="{StaticResource SmallTopMargin}" 
                           IsOn="{Binding Mode=TwoWay, Path=RestoreFlagsOnLaunch}"
@@ -100,11 +107,13 @@
                        Style="{StaticResource SettingsGroupTitleStyle}"
                        Margin="{StaticResource XSmallBottomMargin}"/>
 
-            <HyperlinkButton x:Uid="Module_overview"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/powerrename">
-                             NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/powerrename"/>
+                <TextBlock x:Uid="Module_overview" />
+            </HyperlinkButton>
 
-            <HyperlinkButton x:Uid="Give_Feedback"
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
-                             NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
 
 
             <TextBlock 
@@ -112,8 +121,9 @@
                 Style="{StaticResource SettingsGroupTitleStyle}" />
 
             <HyperlinkButton 
-                Content="Chris Davis's SmartRenamer" 
+                NavigateUri="https://github.com/chrdavis/SmartRename">
-                NavigateUri="https://github.com/chrdavis/SmartRename" />
+                <TextBlock Text="Chris Davis's SmartRenamer" TextWrapping="Wrap" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>

src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml

@@ -46,7 +46,7 @@
 
             <ToggleSwitch x:Uid="ShortcutGuide_Enable"
                           IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}"
-                          Margin="{StaticResource SmallTopMargin}"/>
+                          Margin="{StaticResource MediumTopMargin}"/>
 
             <TextBlock x:Uid="ShortcutGuide_Appearance_Behavior" 
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
@@ -97,9 +97,13 @@
 
             <Image Source="https://raw.githubusercontent.com/microsoft/PowerToys/dev/build-features/doc/images/shortcut_guide/usage.png" />
 
-            <HyperlinkButton 
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/shortcut_guide/README.md">
-                x:Uid="Module_overview"
+                <TextBlock x:Uid="Module_overview"/>
-                NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/shortcut_guide/README.md"/>
+            </HyperlinkButton>
+
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
+                <TextBlock x:Uid="Give_Feedback" />
+            </HyperlinkButton>
         </StackPanel>
     </Grid>
 </Page>

src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp

@@ -96,8 +96,14 @@ void createEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan
 
     //  Text block for information about remap key section.
     TextBlock keyRemapInfoHeader;
-    keyRemapInfoHeader.Text(L"Select the key you want to remap, original key, and it's new output when pressed, the new key");
+    keyRemapInfoHeader.Text(L"Select the key you want to change (Original Key) and the key you want it to become (New Key).");
     keyRemapInfoHeader.Margin({ 10, 0, 0, 10 });
+    keyRemapInfoHeader.FontWeight(Text::FontWeights::SemiBold());
+
+    TextBlock keyRemapInfoExample;
+    keyRemapInfoExample.Text(L"For example, if you want to press A and get B, Key A would be your \"Original Key\" and Key B would be your \"New Key\".");
+    keyRemapInfoExample.Margin({ 10, 0, 0, 20 });
+    keyRemapInfoExample.FontStyle(Text::FontStyle::Italic);
 
     // Table to display the key remaps
     Grid keyRemapTable;
@@ -304,6 +310,7 @@ void createEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan
 
     StackPanel mappingsPanel;
     mappingsPanel.Children().Append(keyRemapInfoHeader);
+    mappingsPanel.Children().Append(keyRemapInfoExample);
     mappingsPanel.Children().Append(keyRemapTable);
     mappingsPanel.Children().Append(addRemapKey);
 

src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp

@@ -95,6 +95,17 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa
         PostMessage(_hWndEditShortcutsWindow, WM_CLOSE, 0, 0);
     });
 
+    //  Text block for information about remap key section.
+    TextBlock shortcutRemapInfoHeader;
+    shortcutRemapInfoHeader.Text(L"Select shortcut you want to change (Original Shortcut) and the shortcut (New Shortcut) you want it to invoke.");
+    shortcutRemapInfoHeader.Margin({ 10, 0, 0, 10 });
+    shortcutRemapInfoHeader.FontWeight(Text::FontWeights::SemiBold());
+
+    TextBlock shortcutRemapInfoExample;
+    shortcutRemapInfoExample.Text(L"For example, if you want Ctrl+C to paste, Ctrl+C is the Original Shortcut and Ctrl+V is the New Shortcut.");
+    shortcutRemapInfoExample.Margin({ 10, 0, 0, 20 });
+    shortcutRemapInfoExample.FontStyle(Text::FontStyle::Italic);
+
     // Table to display the shortcuts
     Windows::UI::Xaml::Controls::Grid shortcutTable;
     ColumnDefinition firstColumn;
@@ -228,6 +239,8 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa
     });
 
     StackPanel mappingsPanel;
+    mappingsPanel.Children().Append(shortcutRemapInfoHeader);
+    mappingsPanel.Children().Append(shortcutRemapInfoExample);
     mappingsPanel.Children().Append(shortcutTable);
     mappingsPanel.Children().Append(addShortcut);
 

src/modules/keyboardmanager/ui/ShortcutControl.cpp

@@ -40,6 +40,7 @@ void ShortcutControl::AddNewShortcutControlRow(Grid& parent, std::vector<std::ve
     deleteSymbol.FontFamily(Xaml::Media::FontFamily(L"Segoe MDL2 Assets"));
     deleteSymbol.Glyph(L"\xE74D");
     deleteShortcut.Content(deleteSymbol);
+    deleteShortcut.Background(Media::SolidColorBrush(Colors::Transparent()));
     deleteShortcut.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
         Button currentButton = sender.as<Button>();
         uint32_t index;

src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp

@@ -63,6 +63,7 @@ void SingleKeyRemapControl::AddNewControlKeyRemapRow(Grid& parent, std::vector<s
     deleteSymbol.FontFamily(Xaml::Media::FontFamily(L"Segoe MDL2 Assets"));
     deleteSymbol.Glyph(L"\xE74D");
     deleteRemapKeys.Content(deleteSymbol);
+    deleteRemapKeys.Background(Media::SolidColorBrush(Colors::Transparent()));
     deleteRemapKeys.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
         Button currentButton = sender.as<Button>();
         uint32_t index;

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs

@@ -8,6 +8,7 @@ using Wox.Infrastructure.Logger;
 using Wox.Infrastructure.Image;
 using Wox.Plugin.SharedCommands;
 using Wox.Plugin;
+using System.Reflection;
 
 namespace Microsoft.Plugin.Folder
 {
@@ -34,6 +35,7 @@ namespace Microsoft.Plugin.Folder
                 var fileOrFolder = (record.Type == ResultType.File) ? "file" : "folder";
                 contextMenus.Add(new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = "Copy path",
                     Glyph = "\xE8C8",
                     FontFamily = "Segoe MDL2 Assets",
@@ -65,6 +67,7 @@ namespace Microsoft.Plugin.Folder
         {
             return new ContextMenuResult
             {
+                PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                 Title = "Open containing folder",
                 Glyph = "\xE838",
                 FontFamily = "Segoe MDL2 Assets",

src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs

@@ -6,6 +6,7 @@ using System.Windows;
 using Wox.Infrastructure.Logger;
 using Wox.Plugin;
 using Microsoft.Plugin.Indexer.SearchHelper;
+using System.Reflection;
 
 namespace Microsoft.Plugin.Indexer
 {
@@ -39,6 +40,7 @@ namespace Microsoft.Plugin.Indexer
                 var fileOrFolder = (type == ResultType.File) ? "file" : "folder";
                 contextMenus.Add(new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = "Copy path",
                     Glyph = "\xE8C8",
                     FontFamily = "Segoe MDL2 Assets",
@@ -71,6 +73,7 @@ namespace Microsoft.Plugin.Indexer
         {
             return new ContextMenuResult
             {
+                PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                 Title = "Open containing folder",
                 Glyph = "\xE838",
                 FontFamily = "Segoe MDL2 Assets",

src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs

@@ -20,6 +20,7 @@ using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Media;
 using System.Windows.Controls;
 using Wox.Plugin;
+using System.Reflection;
 
 namespace Microsoft.Plugin.Program.Programs
 {
@@ -314,6 +315,7 @@ namespace Microsoft.Plugin.Program.Programs
                 {
                     new ContextMenuResult
                     {
+                        PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                         Title = api.GetTranslation("wox_plugin_program_open_containing_folder"),
                         Glyph = "\xE838",
                         FontFamily = "Segoe MDL2 Assets",

src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs

@@ -12,6 +12,7 @@ using Shell;
 using Wox.Infrastructure;
 using Microsoft.Plugin.Program.Logger;
 using Wox.Plugin;
+using System.Reflection;
 
 namespace Microsoft.Plugin.Program.Programs
 {
@@ -95,6 +96,7 @@ namespace Microsoft.Plugin.Program.Programs
             {
                 new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = api.GetTranslation("wox_plugin_program_run_as_administrator"),
                     Glyph = "\xE7EF",
                     FontFamily = "Segoe MDL2 Assets",
@@ -117,6 +119,7 @@ namespace Microsoft.Plugin.Program.Programs
                 },
                 new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = api.GetTranslation("wox_plugin_program_open_containing_folder"),
                     Glyph = "\xE838",
                     FontFamily = "Segoe MDL2 Assets",

src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs

@@ -18,6 +18,7 @@ using Wox.Plugin;
 using Application = System.Windows.Application;
 using Control = System.Windows.Controls.Control;
 using Keys = System.Windows.Forms.Keys;
+using System.Reflection;
 
 namespace Microsoft.Plugin.Shell
 {
@@ -341,6 +342,7 @@ namespace Microsoft.Plugin.Shell
             {
                 new ContextMenuResult
                 {
+                    PluginName = Assembly.GetExecutingAssembly().GetName().Name,
                     Title = _context.API.GetTranslation("wox_plugin_cmd_run_as_administrator"),
                     Glyph = "\xE7EF",
                     FontFamily = "Segoe MDL2 Assets",

src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherBootEvent.cs

@@ -0,0 +1,10 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class LauncherBootEvent 
+    {
+        public double BootTimeMs { get; set; }
+    }
+}

src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherFirstDeleteEvent.cs

@@ -0,0 +1,9 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class LauncherFirstDeleteEvent
+    {
+    }
+}

src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherHideEvent.cs

@@ -0,0 +1,9 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class LauncherHideEvent
+    {
+    }
+}

src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherQueryEvent.cs

@@ -0,0 +1,16 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    /// <summary>
+    /// ETW Event for when the user initiates a query
+    /// </summary>
+    [EventData]
+    public class LauncherQueryEvent
+    {
+        public double QueryTimeMs { get; set; }
+        public int QueryLength { get; set; }
+        public int NumResults { get; set; }
+    }
+
+}

src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherResultActionEvent.cs

@@ -0,0 +1,22 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    /// <summary>
+    /// ETW event for when a result is actioned.
+    /// </summary>
+    [EventData]
+    public class LauncherResultActionEvent 
+    {
+
+        public enum TriggerType
+        {
+            Click,
+            KeyboardShortcut
+        }
+
+        public string Trigger { get; set; }
+        public string PluginName { get; set; }
+        public string ActionName { get; set; }
+    }
+}

src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherShowEvent.cs

@@ -0,0 +1,9 @@
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerLauncher.Telemetry
+{
+    [EventData]
+    public class LauncherShowEvent 
+    {
+    }
+}

src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\Telemetry.csproj" />
+  </ItemGroup>
+
+</Project>

src/modules/launcher/PowerLauncher.UI/PowerLauncher.UI.csproj

@@ -106,6 +106,12 @@
       <Version>2.4.0-prerelease.200322001</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj">
+      <Project>{08c8c05f-0362-41bc-818c-724572df8b06}</Project>
+      <Name>PowerLauncher.Telemetry</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

src/modules/launcher/PowerLauncher.UI/ResultList.xaml

@@ -99,7 +99,7 @@
                                    SelectedIndex="{Binding ContextMenuSelectedIndex}">
                             <GridView.ItemTemplate>
                                 <DataTemplate>
-                                    <Button Command="{Binding Command}" VerticalAlignment="Center" CornerRadius="4" Height="42" Width="42" BorderThickness="1" Style="{ThemeResource IconOnlyButton}">
+                                    <Button   Command="{Binding Command}" VerticalAlignment="Center" CornerRadius="4" Height="42" Width="42" BorderThickness="1" Style="{ThemeResource IconOnlyButton}" Click="ContextButton_OnClick">
                                         <ToolTipService.ToolTip>
                                             <TextBlock Text="{Binding Title}"/>
                                         </ToolTipService.ToolTip>
@@ -111,6 +111,7 @@
                                                 Key="{Binding AcceleratorKey}"
                                                 Modifiers="{Binding AcceleratorModifiers}"
                                                 IsEnabled="{Binding IsAcceleratorKeyEnabled}"
+                                                Invoked="ContextButton_OnAcceleratorInvoked"
                                             />
                                         </Button.KeyboardAccelerators>
                                     </Button>

src/modules/launcher/PowerLauncher.UI/ResultList.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.PowerLauncher.Telemetry;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -10,9 +11,35 @@ namespace PowerLauncher.UI
 {
     public sealed partial class ResultList : UserControl
     {
+        private LauncherResultActionEvent.TriggerType triggerType = LauncherResultActionEvent.TriggerType.Click;
         public ResultList()
         {
             InitializeComponent();
         }
+
+
+        private void ContextButton_OnAcceleratorInvoked(Windows.UI.Xaml.Input.KeyboardAccelerator sender, Windows.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
+        {
+            this.triggerType = LauncherResultActionEvent.TriggerType.KeyboardShortcut;
+        }
+
+        private void ContextButton_OnClick(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            var button = sender as Windows.UI.Xaml.Controls.Button;
+
+            if (button != null)
+            {
+                //We currently can't take a reference on the wox project from a UWP project.  The dynamic method invocation should be replaced
+                //by a call to the view model once we refactor the project.
+                var dataContext = ((dynamic)button.DataContext);
+                if(dataContext?.GetType().GetMethod("SendTelemetryEvent") != null)
+                {
+                    dataContext.SendTelemetryEvent(triggerType);
+                }
+            }
+
+            //Restore the trigger type back to click
+            triggerType = LauncherResultActionEvent.TriggerType.Click;
+        }
     }
 }

src/modules/launcher/PowerLauncher/App.xaml.cs

@@ -1,3 +1,5 @@
+using Microsoft.PowerLauncher.Telemetry;
+using Microsoft.PowerToys.Telemetry;
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
@@ -50,6 +52,8 @@ namespace PowerLauncher
 
         private void OnStartup(object sender, StartupEventArgs e)
         {
+            var bootTime = new System.Diagnostics.Stopwatch();
+            bootTime.Start();
             Stopwatch.Normal("|App.OnStartup|Startup cost", () =>
             {
                 Log.Info("|App.OnStartup|Begin Wox startup ----------------------------------------------------");
@@ -93,7 +97,9 @@ namespace PowerLauncher
                 _mainVM.MainWindowVisibility = Visibility.Visible;
                 Log.Info("|App.OnStartup|End Wox startup ----------------------------------------------------  ");
 
+                bootTime.Stop();
 
+                PowerToysTelemetry.Log.WriteEvent(new LauncherBootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
 
                 //[Conditional("RELEASE")]
                 // check udpate every 5 hours

src/modules/launcher/PowerLauncher/MainWindow.xaml.cs

@@ -26,6 +26,9 @@ using Windows.UI.Xaml.Data;
 using System.Diagnostics;
 using Mages.Core.Runtime.Converters;
 using System.Runtime.InteropServices;
+using Microsoft.PowerLauncher.Telemetry;
+using System.Timers;
+using Microsoft.PowerToys.Telemetry;
 
 namespace PowerLauncher
 {
@@ -41,6 +44,9 @@ namespace PowerLauncher
         const int ROW_HEIGHT = 75;
         const int MAX_LIST_HEIGHT = 300;
         bool isDPIChanged = false;
+        bool _deletePressed = false;
+        Timer _firstDeleteTimer = new Timer();
+
 
         #endregion
 
@@ -51,7 +57,21 @@ namespace PowerLauncher
             _settings = settings;
             InitializeComponent();
 
+            _firstDeleteTimer.Elapsed += CheckForFirstDelete;
+            _firstDeleteTimer.Interval = 1000;
+
         }
+
+        private void CheckForFirstDelete(object sender, ElapsedEventArgs e)
+        {
+            _firstDeleteTimer.Stop();
+            if (_deletePressed)
+            {
+                PowerToysTelemetry.Log.WriteEvent(new LauncherFirstDeleteEvent());
+            }
+
+        }
+
         public MainWindow()
         {
             InitializeComponent();
@@ -202,6 +222,8 @@ namespace PowerLauncher
                 {
                     if (Visibility == System.Windows.Visibility.Visible)
                     {
+                        _deletePressed = false;
+                        _firstDeleteTimer.Start();
                         Activate();
                         UpdatePosition();
                         _settings.ActivateTimes++;
@@ -216,6 +238,10 @@ namespace PowerLauncher
                             _launcher.QueryTextBox.SelectAll();
                         }
                     }
+                    else
+                    {
+                        _firstDeleteTimer.Stop();
+                    }
                 }
                 else if(e.PropertyName == nameof(MainViewModel.SystemQueryText))
                 {
@@ -307,6 +333,10 @@ namespace PowerLauncher
                 _viewModel.SelectPrevPageCommand.Execute(null);
                 e.Handled = true;
             }
+            else if( e.Key == VirtualKey.Back)
+            {
+                _deletePressed = true;
+            }
         }
 
         private void UpdateTextBoxToSelectedItem()

src/modules/launcher/PowerLauncher/PowerLauncher.csproj

@@ -66,7 +66,6 @@
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="2.0.1" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
     <PackageReference Include="NuGet.CommandLine" Version="5.5.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj

@@ -50,8 +50,8 @@
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" />
     <PackageReference Include="NLog.Schema" Version="4.7.0" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
     <PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />

src/modules/launcher/Wox.Plugin/ContextMenuResult.cs

@@ -8,6 +8,7 @@ namespace Wox.Plugin
 
     public class ContextMenuResult
     {
+        public string PluginName { get; set; }
         public string Title { get; set; }
         public string SubTitle { get; set; }
 

src/modules/launcher/Wox/ViewModel/ContextMenuItemViewModel.cs

@@ -1,4 +1,7 @@
-using System.Drawing;
+using Microsoft.PowerLauncher.Telemetry;
+using Microsoft.PowerToys.Telemetry;
+using System.Drawing;
+using System.Windows.Forms;
 using System.Windows.Input;
 using Wox.Plugin;
 
@@ -6,6 +9,7 @@ namespace Wox.ViewModel
 {
     public class ContextMenuItemViewModel : BaseModel
     {
+        public string PluginName { get; set; }
         public string Title { get; set; }
         public string Glyph { get; set; }
         public string FontFamily { get; set; }
@@ -13,5 +17,17 @@ namespace Wox.ViewModel
         public string AcceleratorKey { get; set; }
         public string AcceleratorModifiers { get; set; }
         public bool IsAcceleratorKeyEnabled { get; set; }
+
+        public void SendTelemetryEvent(LauncherResultActionEvent.TriggerType triggerType)
+        {
+            var eventData = new LauncherResultActionEvent()
+            {
+                PluginName = PluginName,
+                Trigger = triggerType.ToString(),
+                ActionName = Title
+
+            };
+            PowerToysTelemetry.Log.WriteEvent(eventData);
+        }
     }
 }

src/modules/launcher/Wox/ViewModel/MainViewModel.cs

@@ -17,7 +17,9 @@ using Wox.Infrastructure.Hotkey;
 using Wox.Infrastructure.Storage;
 using Wox.Infrastructure.UserSettings;
 using Wox.Plugin;
+using Microsoft.PowerLauncher.Telemetry;
 using Wox.Storage;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Wox.ViewModel
 {
@@ -303,7 +305,22 @@ namespace Wox.ViewModel
 
         public Visibility ProgressBarVisibility { get; set; }
 
-        public Visibility MainWindowVisibility { get; set; }
+        private Visibility _visibility = Visibility.Collapsed;
+        public Visibility MainWindowVisibility {
+            get { return _visibility; }
+            set {
+                _visibility = value;
+                if(value == Visibility.Visible)
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new LauncherShowEvent());
+                }
+                else
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new LauncherHideEvent());
+                }
+            
+            }
+        }
 
         public ICommand EscCommand { get; set; }
         public ICommand SelectNextItemCommand { get; set; }
@@ -380,6 +397,8 @@ namespace Wox.ViewModel
         {
             if (!string.IsNullOrEmpty(QueryText))
             {
+                var queryTimer = new System.Diagnostics.Stopwatch();
+                queryTimer.Start();
                 _updateSource?.Cancel();
                 var currentUpdateSource = new CancellationTokenSource();
                 _updateSource = currentUpdateSource;
@@ -435,6 +454,16 @@ namespace Wox.ViewModel
                         { // update to hidden if this is still the current query
                             ProgressBarVisibility = Visibility.Hidden;
                         }
+
+                        queryTimer.Stop();
+                        var queryEvent = new LauncherQueryEvent()
+                        {
+                            QueryTimeMs = queryTimer.ElapsedMilliseconds,
+                            NumResults = Results.Results.Count,
+                            QueryLength = query.RawQuery.Length
+                        };
+                        PowerToysTelemetry.Log.WriteEvent(queryEvent);
+
                     }, currentCancellationToken);
                 }
             }

src/modules/launcher/Wox/ViewModel/ResultViewModel.cs

@@ -119,6 +119,7 @@ namespace Wox.ViewModel
             {
                 newItems.Add(new ContextMenuItemViewModel
                 {
+                    PluginName = r.PluginName,
                     Title = r.Title,
                     Glyph = r.Glyph,
                     FontFamily = r.FontFamily,

src/modules/launcher/Wox/Wox.csproj

@@ -61,7 +61,6 @@
     <PackageReference Include="Mages" Version="1.6.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="2.0.1" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
     <PackageReference Include="NuGet.CommandLine" Version="5.5.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -76,6 +75,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj" />
     <ProjectReference Include="..\Wox.Core\Wox.Core.csproj" />
     <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
     <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj" />

src/modules/previewpane/common/PreviewHandlerCommon.csproj

@@ -93,6 +93,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\common\Telemetry\TelemetryBase.cs">
+      <Link>Telemetry\TelemetryBase.cs</Link>
+    </Compile>
     <Compile Include="cominterop\IInitializeWithFile.cs" />
     <Compile Include="cominterop\COLORREF.cs" />
     <Compile Include="cominterop\IInitializeWithStream.cs" />
@@ -122,7 +125,6 @@
     <Compile Include="handlers\PreviewHandlerBase.cs" />
     <Compile Include="handlers\StreamBasedPreviewHandler.cs" />
     <Compile Include="examplehandler\TestCustomHandler.cs" />
-    <Compile Include="Telemetry\TelemetryBase.cs" />
     <Compile Include="Utilities\StreamWrapper.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -137,5 +139,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>