From 0c4fb00d25b37acfbfad850d34ae16d605ba5006 Mon Sep 17 00:00:00 2001
From: andreww-msft <30507740+andreww-msft@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:05:28 -0700
Subject: [PATCH] AdditionalTools validation & feedback (#3108)

* AdditionalTools validation & feedback

* Updates per feedback

* More updates per feedback

* More feedback, another update

* Second half of the pin icon fix I missed last time.

* Updates per feedback.
---
 tools/PI/DevHome.PI/BarWindowHorizontal.xaml  |   2 +-
 .../PI/DevHome.PI/BarWindowHorizontal.xaml.cs |  15 ++
 tools/PI/DevHome.PI/BarWindowVertical.xaml    |   2 +-
 tools/PI/DevHome.PI/BarWindowVertical.xaml.cs |  10 ++
 .../DevHome.PI/Controls/AddToolControl.xaml   | 154 ++++++++----------
 .../Controls/AddToolControl.xaml.cs           |  29 +++-
 .../DevHome.PI/Controls/EditToolsControl.xaml |  18 +-
 .../Controls/EditToolsControl.xaml.cs         |  26 ++-
 tools/PI/DevHome.PI/Helpers/WindowHelper.cs   |  55 ++++++-
 tools/PI/DevHome.PI/Pages/AppDetailsPage.xaml |   2 +-
 .../DevHome.PI/Strings/en-us/Resources.resw   |  68 +++++++-
 11 files changed, 274 insertions(+), 107 deletions(-)

diff --git a/tools/PI/DevHome.PI/BarWindowHorizontal.xaml b/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
index 06c36c5760..9215d0b1a3 100644
--- a/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
+++ b/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
@@ -83,7 +83,7 @@
                 HorizontalAlignment="Center"
                 Click="ManageExternalToolsButton_Click">
                 <Button.ContextFlyout>
-                    <MenuFlyout x:Name="ExternalToolsMenu">
+                    <MenuFlyout x:Name="ExternalToolsMenu" Opening="ExternalToolsMenu_Opening">
                         <!-- We can't databind to MenuFlyout, so we'll add a MenuFlyoutItem
                         for each external tool in codebehind here. -->
                     </MenuFlyout>
diff --git a/tools/PI/DevHome.PI/BarWindowHorizontal.xaml.cs b/tools/PI/DevHome.PI/BarWindowHorizontal.xaml.cs
index 1cecbf979a..02bf7e1c10 100644
--- a/tools/PI/DevHome.PI/BarWindowHorizontal.xaml.cs
+++ b/tools/PI/DevHome.PI/BarWindowHorizontal.xaml.cs
@@ -36,6 +36,8 @@ public partial class BarWindowHorizontal : WindowEx
     private readonly string _pinMenuItemText = CommonHelper.GetLocalizedString("PinMenuItemText");
     private readonly string _unpinMenuItemText = CommonHelper.GetLocalizedString("UnpinMenuItemText");
     private readonly BarWindowViewModel _viewModel;
+    private readonly FontIcon _pinIcon = new() { Glyph = "\uE718" };
+    private readonly FontIcon _unpinIcon = new() { Glyph = "\uE77A" };
 
     private ExternalTool? _selectedExternalTool;
     private INotifyCollectionChanged? _externalTools;
@@ -227,6 +229,15 @@ private void ManageExternalToolsButton_Click(object sender, RoutedEventArgs e)
         ExpandedViewControl.NavigateToSettings(typeof(AdditionalToolsViewModel).FullName!);
     }
 
+    private void ExternalToolsMenu_Opening(object sender, object e)
+    {
+        // Cancel the opening of the menu if there are no items.
+        if (sender is MenuFlyout flyout && flyout?.Items?.Count == 0)
+        {
+            flyout.Hide();
+        }
+    }
+
     private void ExternalToolMenuItem_RightTapped(object sender, RightTappedRoutedEventArgs e)
     {
         var menuItem = sender as MenuFlyoutItem;
@@ -236,10 +247,12 @@ private void ExternalToolMenuItem_RightTapped(object sender, RightTappedRoutedEv
             if (_selectedExternalTool.IsPinned)
             {
                 PinUnpinMenuItem.Text = _unpinMenuItemText;
+                PinUnpinMenuItem.Icon = _unpinIcon;
             }
             else
             {
                 PinUnpinMenuItem.Text = _pinMenuItemText;
+                PinUnpinMenuItem.Icon = _pinIcon;
             }
 
             ToolContextMenu.ShowAt(menuItem, e.GetPosition(menuItem));
@@ -291,10 +304,12 @@ private void ExternalToolButton_PointerPressed(object sender, PointerRoutedEvent
             if (_selectedExternalTool.IsPinned)
             {
                 PinUnpinMenuItem.Text = _unpinMenuItemText;
+                PinUnpinMenuItem.Icon = _unpinIcon;
             }
             else
             {
                 PinUnpinMenuItem.Text = _pinMenuItemText;
+                PinUnpinMenuItem.Icon = _pinIcon;
             }
         }
     }
diff --git a/tools/PI/DevHome.PI/BarWindowVertical.xaml b/tools/PI/DevHome.PI/BarWindowVertical.xaml
index 5ef7f3c187..625f31b92d 100644
--- a/tools/PI/DevHome.PI/BarWindowVertical.xaml
+++ b/tools/PI/DevHome.PI/BarWindowVertical.xaml
@@ -85,7 +85,7 @@
                 x:Uid="ManageExternalToolsButton"
                 HorizontalAlignment="Center">
                 <Button.ContextFlyout>
-                    <MenuFlyout x:Name="ExternalToolsMenu">
+                    <MenuFlyout x:Name="ExternalToolsMenu" Opening="ExternalToolsMenu_Opening">
                         <!-- We can't databind to MenuFlyout, so we'll add a MenuFlyoutItem
                         for each external tool in codebehind here. -->
                     </MenuFlyout>
diff --git a/tools/PI/DevHome.PI/BarWindowVertical.xaml.cs b/tools/PI/DevHome.PI/BarWindowVertical.xaml.cs
index c42a568d89..91f0b347d0 100644
--- a/tools/PI/DevHome.PI/BarWindowVertical.xaml.cs
+++ b/tools/PI/DevHome.PI/BarWindowVertical.xaml.cs
@@ -95,6 +95,16 @@ private void MainPanel_Loaded(object sender, RoutedEventArgs e)
         Width = 70;
     }
 
+    private void ExternalToolsMenu_Opening(object sender, object e)
+    {
+        // Cancel the opening of the menu if there are no items.
+        var flyout = sender as MenuFlyout;
+        if (flyout is not null && flyout.Items is not null && flyout.Items.Count == 0)
+        {
+            flyout.Hide();
+        }
+    }
+
     private void ExternalToolButton_Click(object sender, RoutedEventArgs e)
     {
         if (sender is Button clickedButton)
diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
index 436f7cda95..9a30aa8d1b 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
@@ -17,95 +17,83 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <Border>
-            <StackPanel Orientation="Vertical">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock 
-                        x:Uid="ToolPathHeaderTextBlock" 
-                        VerticalAlignment="Center" />
-                    <TextBox 
-                        x:Name="ToolPathTextBox" Grid.Column="1" MinWidth="800"
-                        TextChanged="UpdateSampleCommandline"/>
-                    <Button 
-                        x:Uid="ToolBrowseButton" Name="BrowseButton" Grid.Column="2"
-                        Width="100" Margin="8,0,0,0" HorizontalAlignment="Left"
-                        Click="BrowseButton_Click"/>
-                </Grid>
-                <Grid Margin="0,6,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100"/>
-                        <ColumnDefinition Width="200"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock x:Uid="ToolNameHeaderTextBlock" VerticalAlignment="Center"/>
-                    <TextBox x:Name="ToolNameTextBox" Grid.Column="1" HorizontalAlignment="Stretch"/>
-                </Grid>
-            </StackPanel>
-        </Border>
-
-        <Border Grid.Row="1" Margin="0,12,0,0">
+        <StackPanel Orientation="Vertical">
             <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-                <TextBlock x:Uid="BasicArgumentsTextBlock"/>
-                <Grid Grid.Row="1" Margin="0,6,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="100"/>
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                        <RadioButton 
-                            x:Uid="NoneRadio" x:Name="NoneRadio" IsChecked="True" GroupName="SwitchGroup" 
-                            Checked="UpdateSampleCommandline"/>
-                        <RadioButton 
-                            x:Uid="HwndRadio" x:Name="HwndRadio" GroupName="SwitchGroup" 
-                            Checked="UpdateSampleCommandline"/>
-                        <RadioButton 
-                            x:Uid="ProcessIdRadio" x:Name="ProcessIdRadio" GroupName="SwitchGroup" 
-                            Checked="UpdateSampleCommandline"/>
-                    </StackPanel>
-                    <TextBlock 
-                        x:Uid="PrefixTextBlock" Grid.Column="1" Margin="0,0,8,0"
-                        VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                    <TextBox 
-                        x:Name="PrefixTextBox" Grid.Column="2" Width="100" HorizontalAlignment="Right" 
-                        TextChanged="UpdateSampleCommandline"/>
-                </Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Button 
+                    x:Name="ToolBrowseButton" x:Uid="ToolBrowseButton" 
+                    HorizontalAlignment="Left" MinWidth="100"
+                    Click="ToolBrowseButton_Click"/>
+                <TextBox 
+                    x:Name="ToolPathTextBox" Grid.Column="1" MinWidth="800" Margin="8,0,0,0" 
+                    IsReadOnly="True"/>
+            </Grid>
+            <Grid Margin="0,6,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="200"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock x:Uid="ToolNameHeaderTextBlock" VerticalAlignment="Center" MinWidth="100"/>
+                <TextBox x:Name="ToolNameTextBox" Grid.Column="1" HorizontalAlignment="Stretch" Margin="8,0,0,0" />
             </Grid>
-        </Border>
+        </StackPanel>
 
-        <Border Grid.Row="2" Margin="0,12,0,0">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-                <TextBlock x:Uid="OtherArgumentsTextBlock"/>
-                <TextBox
-                    x:Name="OtherArgsTextBox" Grid.Row="1" TextWrapping="Wrap" MinHeight="60"
+        <Grid Grid.Row="1" Margin="0,12,0,0">
+        <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <TextBlock x:Uid="BasicArgumentsTextBlock"/>
+            <Grid Grid.Row="1" Margin="0,6,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                    <RadioButton 
+                        x:Uid="NoneRadio" x:Name="NoneRadio" IsChecked="True" GroupName="SwitchGroup" 
+                        Checked="UpdateSampleCommandline"/>
+                    <RadioButton 
+                        x:Uid="HwndRadio" x:Name="HwndRadio" GroupName="SwitchGroup" 
+                        Checked="UpdateSampleCommandline"/>
+                    <RadioButton 
+                        x:Uid="ProcessIdRadio" x:Name="ProcessIdRadio" GroupName="SwitchGroup" 
+                        Checked="UpdateSampleCommandline"/>
+                </StackPanel>
+                <TextBlock 
+                    x:Uid="PrefixTextBlock" Grid.Column="1" Margin="0,0,8,0"
+                    VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                <TextBox 
+                    x:Name="PrefixTextBox" Grid.Column="2" MinWidth="150" HorizontalAlignment="Right" 
                     TextChanged="UpdateSampleCommandline"/>
             </Grid>
-        </Border>
+        </Grid>
 
-        <Border Grid.Row="3" Margin="0,12,0,0">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-                <TextBlock x:Uid="SampleCommandLineTextBlock"/>
-                <TextBox
-                    x:Name="SampleCommandTextBox" Grid.Row="1" MinHeight="60"
-                    TextWrapping="Wrap" IsReadOnly="True"/>
-            </Grid>
-        </Border>
+        <Grid Grid.Row="2" Margin="0,12,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <TextBlock x:Uid="OtherArgumentsTextBlock"/>
+            <TextBox
+                x:Name="OtherArgsTextBox" Grid.Row="1" TextWrapping="Wrap" MinHeight="60"
+                TextChanged="UpdateSampleCommandline"/>
+        </Grid>
+
+        <Grid Grid.Row="3" Margin="0,12,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <TextBlock x:Uid="SampleCommandLineTextBlock"/>
+            <TextBox
+                x:Name="SampleCommandTextBox" Grid.Row="1" MinHeight="60"
+                TextWrapping="Wrap" IsReadOnly="True"/>
+        </Grid>
 
         <ToggleSwitch 
             x:Uid="IsPinnedToggleSwitch" x:Name="IsPinnedToggleSwitch"
diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
index 2032f9aa03..41aa6fccfc 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System;
 using System.Runtime.InteropServices;
+using DevHome.Common;
 using DevHome.Common.Extensions;
 using DevHome.PI.Helpers;
 using Microsoft.UI.Xaml;
@@ -13,12 +15,15 @@ namespace DevHome.PI.Controls;
 
 public sealed partial class AddToolControl : UserControl
 {
+    private readonly string invalidToolInfo = CommonHelper.GetLocalizedString("InvalidToolInfoMessage");
+    private readonly string messageCloseText = CommonHelper.GetLocalizedString("MessageCloseText");
+
     public AddToolControl()
     {
         InitializeComponent();
     }
 
-    private void BrowseButton_Click(object sender, RoutedEventArgs e)
+    private void ToolBrowseButton_Click(object sender, RoutedEventArgs e)
     {
         HandleBrowseButton();
     }
@@ -68,7 +73,15 @@ private void HandleBrowseButton()
 
     private void OkButton_Click(object sender, RoutedEventArgs e)
     {
-        ExternalToolsHelper.Instance.AddExternalTool(GetCurrentToolDefinition());
+        var tool = GetCurrentToolDefinition();
+        if (tool is null)
+        {
+            return;
+        }
+
+        ExternalToolsHelper.Instance.AddExternalTool(tool);
+        var toolRegisteredMessage = CommonHelper.GetLocalizedString("ToolRegisteredMessage", ToolNameTextBox.Text);
+        WindowHelper.ShowTimedMessageDialog(this, toolRegisteredMessage, messageCloseText);
         ClearValues();
     }
 
@@ -82,8 +95,14 @@ private void ClearValues()
         IsPinnedToggleSwitch.IsOn = true;
     }
 
-    private ExternalTool GetCurrentToolDefinition()
+    private ExternalTool? GetCurrentToolDefinition()
     {
+        if (string.IsNullOrEmpty(ToolNameTextBox.Text) || string.IsNullOrEmpty(ToolPathTextBox.Text))
+        {
+            WindowHelper.ShowTimedMessageDialog(this, invalidToolInfo, messageCloseText);
+            return null;
+        }
+
         var argType = ExternalToolArgType.None;
 
         if (HwndRadio.IsChecked ?? false)
@@ -123,6 +142,10 @@ private void UpdateSampleCommandline()
         }
 
         var tool = GetCurrentToolDefinition();
+        if (tool is null)
+        {
+            return;
+        }
 
         SampleCommandTextBox.Text = tool.CreateFullCommandLine(123, (Windows.Win32.Foundation.HWND)123);
     }
diff --git a/tools/PI/DevHome.PI/Controls/EditToolsControl.xaml b/tools/PI/DevHome.PI/Controls/EditToolsControl.xaml
index a0ed155f40..f7d64fc6ea 100644
--- a/tools/PI/DevHome.PI/Controls/EditToolsControl.xaml
+++ b/tools/PI/DevHome.PI/Controls/EditToolsControl.xaml
@@ -4,6 +4,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:local="using:DevHome.PI.Helpers"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
@@ -15,6 +16,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
+        
         <controls:DataGrid
             x:Name="ToolsDataGrid"
             VerticalScrollBarVisibility="Visible"
@@ -27,17 +29,25 @@
             CanUserReorderColumns="True"
             CanUserResizeColumns="True"
             ColumnHeaderHeight="32"
-            MaxColumnWidth="400"
             FrozenColumnCount="0"
             GridLinesVisibility="None"
-            HeadersVisibility="Column">
+            HeadersVisibility="Column"
+            ItemsSource="{x:Bind local:ExternalToolsHelper.Instance.AllExternalTools}"
+            SelectionChanged="ToolsDataGrid_SelectionChanged">
             <controls:DataGrid.Columns>
-                <controls:DataGridTextColumn x:Uid="EditToolsNameColumn" Binding="{Binding Name}" Width="150"/>
+                <controls:DataGridTextColumn x:Uid="EditToolsNameColumn" Binding="{Binding Name}" MinWidth="150"/>
+                <controls:DataGridTextColumn x:Uid="EditToolsNameColumn" Binding="{Binding Executable}" Width="*"/>
             </controls:DataGrid.Columns>
         </controls:DataGrid>
 
         <StackPanel x:Name="GridButtonPanel" Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="0,4,0,8">
-            <Button x:Uid="DeleteToolButton" x:Name="DeleteToolButton" Width="120" Height="36" Margin="4,0,0,0" Click="DeleteToolButton_Click"/>
+            <Button 
+                x:Uid="UnregisterToolButton" 
+                x:Name="UnregisterToolButton" 
+                Width="120" 
+                Height="36" 
+                Margin="4,0,0,0" 
+                Click="UnregisterToolButton_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/tools/PI/DevHome.PI/Controls/EditToolsControl.xaml.cs b/tools/PI/DevHome.PI/Controls/EditToolsControl.xaml.cs
index a06456c5ca..28b3e0a1aa 100644
--- a/tools/PI/DevHome.PI/Controls/EditToolsControl.xaml.cs
+++ b/tools/PI/DevHome.PI/Controls/EditToolsControl.xaml.cs
@@ -12,16 +12,30 @@ public sealed partial class EditToolsControl : UserControl
     public EditToolsControl()
     {
         InitializeComponent();
-        ToolsDataGrid.ItemsSource = ExternalToolsHelper.Instance.AllExternalTools;
+        EnableUnregisterButton();
     }
 
-    private void DeleteToolButton_Click(object sender, RoutedEventArgs e)
+    private void UnregisterToolButton_Click(object sender, RoutedEventArgs e)
     {
-        var selectedItem = ToolsDataGrid.SelectedItem;
-
-        if (selectedItem is ExternalTool)
+        var selectedItems = ToolsDataGrid.SelectedItems;
+        for (var i = selectedItems.Count - 1; i >= 0; i--)
         {
-            ExternalToolsHelper.Instance.RemoveExternalTool((ExternalTool)selectedItem);
+            if (selectedItems[i] is ExternalTool tool)
+            {
+                ExternalToolsHelper.Instance.RemoveExternalTool(tool);
+            }
         }
+
+        EnableUnregisterButton();
+    }
+
+    private void EnableUnregisterButton()
+    {
+        UnregisterToolButton.IsEnabled = ToolsDataGrid.SelectedItems?.Count > 0;
+    }
+
+    private void ToolsDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        EnableUnregisterButton();
     }
 }
diff --git a/tools/PI/DevHome.PI/Helpers/WindowHelper.cs b/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
index 0e0033f507..88c191d269 100644
--- a/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
+++ b/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
@@ -12,13 +12,13 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
+using Serilog;
 using Windows.Devices.Display;
 using Windows.Devices.Enumeration;
 using Windows.Foundation;
 using Windows.Graphics;
 using Windows.Graphics.Imaging;
 using Windows.Storage;
-using Windows.Storage.Streams;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Dwm;
@@ -30,6 +30,8 @@ namespace DevHome.PI.Helpers;
 
 public class WindowHelper
 {
+    private static readonly ILogger _log = Log.ForContext("SourceContext", nameof(WindowHelper));
+
     private static nint GetClassLongPtr(HWND hWnd, GET_CLASS_LONG_INDEX nIndex)
     {
         if (IntPtr.Size == 8)
@@ -553,7 +555,6 @@ private static RECT GetWorkAreaRect()
         return rect;
     }
 
-    // TODO Allow for the taskbar when returning screen size.
     internal static RECT GetMonitorRectForWindow(HWND hWnd)
     {
         var monitor = PInvoke.MonitorFromWindow(hWnd, MONITOR_FROM_FLAGS.MONITOR_DEFAULTTONEAREST);
@@ -581,4 +582,54 @@ internal static void GetAppInfoUnderMouseCursor(out Process? process, out HWND h
             }
         }
     }
+
+    // Only one ContentDialog can be shown at a time, so we have to keep track of the current one.
+    private static ContentDialog? ContentDialog { get; set; }
+
+    internal static async void ShowTimedMessageDialog(FrameworkElement frameworkElement, string message, string closeButtonText)
+    {
+        if (ContentDialog is not null)
+        {
+            ContentDialog.Hide();
+            ContentDialog = null;
+        }
+
+        ContentDialog = new ContentDialog
+        {
+            XamlRoot = frameworkElement.XamlRoot,
+            RequestedTheme = frameworkElement.ActualTheme,
+            Content = message,
+            CloseButtonText = closeButtonText,
+        };
+
+        var timer = new DispatcherTimer
+        {
+            Interval = TimeSpan.FromSeconds(3),
+        };
+        timer.Tick += (s, e) =>
+        {
+            timer.Stop();
+            if (ContentDialog is null)
+            {
+                return;
+            }
+
+            ContentDialog.Hide();
+            ContentDialog = null;
+        };
+
+        try
+        {
+            await ContentDialog.ShowAsync();
+            timer.Start();
+            ContentDialog.Closed += (s, e) =>
+            {
+                ContentDialog = null;
+            };
+        }
+        catch (Exception ex)
+        {
+            _log.Error(ex, "Error showing timed message dialog");
+        }
+    }
 }
diff --git a/tools/PI/DevHome.PI/Pages/AppDetailsPage.xaml b/tools/PI/DevHome.PI/Pages/AppDetailsPage.xaml
index f0e877c439..d8fc7c0525 100644
--- a/tools/PI/DevHome.PI/Pages/AppDetailsPage.xaml
+++ b/tools/PI/DevHome.PI/Pages/AppDetailsPage.xaml
@@ -72,7 +72,7 @@
                     <TextBlock Grid.Row="5" x:Uid="MicrosoftStoreAppTextBlock" />
                     <TextBox Grid.Row="5" Grid.Column="1" Text="{x:Bind ViewModel.AppInfo.IsStoreApp, Mode=OneWay}" IsReadOnly="True" />
 
-                    <TextBlock Grid.Row="6" x:Uid="FrameworkTypesTextBlock" />
+                    <TextBlock Grid.Row="6" x:Uid="FrameworkTypesTextBlock" TextWrapping="Wrap"/>
                     <ListView 
                         Grid.Row="6" Grid.Column="1" IsItemClickEnabled="False"
                         ItemsSource="{x:Bind ViewModel.AppInfo.FrameworkTypes, Mode=OneWay}">
diff --git a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
index 2b44627fc7..9b24e73d3a 100644
--- a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
+++ b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
@@ -405,9 +405,9 @@
     <value>Name</value>
     <comment>The name of a tool that could be edited.</comment>
   </data>
-  <data name="DeleteToolButton.Content" xml:space="preserve">
-    <value>Delete tool</value>
-    <comment>Content on a button to delete a tool.</comment>
+  <data name="UnregisterToolButton.Content" xml:space="preserve">
+    <value>Unregister</value>
+    <comment>Text on a button for unregistering a tool.</comment>
   </data>
   <data name="SettingsToolHeaderTextBlock.Text" xml:space="preserve">
     <value>Settings</value>
@@ -730,7 +730,7 @@
     <comment>Locked={"{0}", "{1}"} A description to help a user that is dealing with non-specific error situation. {0} is the error name. {1} is the error description.</comment>
   </data>
   <data name="FrameworkTypesTextBlock.Text" xml:space="preserve">
-    <value>Framework types</value>
+    <value>Framework types used in this app</value>
     <comment>This refers to the set of application frameworks this application uses.</comment>
   </data>
   <data name="BaseAddressTextBlock.Text" xml:space="preserve">
@@ -846,7 +846,63 @@
     <comment>Header for the settings item to add a tool to the product.</comment>
   </data>
   <data name="SettingsEditToolCard.Header" xml:space="preserve">
-    <value>Edit or delete existing tools</value>
-    <comment>Header for the setting item to edit or delete tools from the product.</comment>
+    <value>Edit or unregister existing tools</value>
+    <comment>Header for the setting item to edit or unregister tools from the product.</comment>
+  </data>
+  <data name="BasePriorityTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The starting priority for threads created within this process</value>
+    <comment>Tooltip for the Base Priority field.</comment>
+  </data>
+  <data name="BinaryTypeTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The CPU architecture of the target process</value>
+    <comment>Tooltip for the Binary Type field.</comment>
+  </data>
+  <data name="FrameworkTypesTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The windowing or application frameworks used in this app</value>
+    <comment>Tooltip for the Framework Types field.</comment>
+  </data>
+  <data name="IDTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The process ID of the target process</value>
+    <comment>Tooltip for the PID field.</comment>
+  </data>
+  <data name="IsRunningAsAdminTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>True if the target process is running under an Administrator account</value>
+    <comment>Tooltip for the Running as Admin field.</comment>
+  </data>
+  <data name="IsRunningAsSystemTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>True if the target process is running as a System process, based on its Session ID</value>
+    <comment>Tooltip for the Running as System field.</comment>
+  </data>
+  <data name="MainModuleTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The executable used to start the process</value>
+    <comment>Tooltip for the Main Module field.</comment>
+  </data>
+  <data name="MicrosoftStoreAppTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>True if this app was deployed via the Microsoft Store</value>
+    <comment>Tooltip for the Microsoft Store field.</comment>
+  </data>
+  <data name="MSIXPackagedTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>True if this process is packaged with MSIX</value>
+    <comment>Tooltip for the MSIX Packaged field.</comment>
+  </data>
+  <data name="PriorityClassTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Threads with different priorities in the process run relative to the priority class of the process</value>
+    <comment>Tooltip for the Priority Class field.</comment>
+  </data>
+  <data name="MessageCloseText" xml:space="preserve">
+    <value>Close</value>
+    <comment>Text used on the Close button on a message dialog.</comment>
+  </data>
+  <data name="ToolRegisteredMessage" xml:space="preserve">
+    <value>External tool {0} registered</value>
+    <comment>Message shown to the user when an external tool is registered.</comment>
+  </data>
+  <data name="EditToolsExecutableColumn.Header" xml:space="preserve">
+    <value>Executable</value>
+    <comment>The executable path of an external tool.</comment>
+  </data>
+  <data name="InvalidToolInfoMessage" xml:space="preserve">
+    <value>Invalid tool path or name</value>
+    <comment>Text for the message to show to the user when the supplied path or name is not valid.</comment>
   </data>
 </root>
\ No newline at end of file