From bccd0e02d135c5911a549751f5e54a80c3efd100 Mon Sep 17 00:00:00 2001
From: Tim Kurtzman <49733346+timkur@users.noreply.github.com>
Date: Mon, 3 Jun 2024 17:59:53 -0700
Subject: [PATCH 1/2] Tooltips for the bar items

---
 tools/PI/DevHome.PI/BarWindowHorizontal.xaml  |  6 ++---
 tools/PI/DevHome.PI/BarWindowVertical.xaml    |  8 ++++---
 .../DevHome.PI/Strings/en-us/Resources.resw   | 24 ++++++++++++-------
 .../ViewModels/BarWindowViewModel.cs          |  5 ++++
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/tools/PI/DevHome.PI/BarWindowHorizontal.xaml b/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
index 06c36c5760..784ed28984 100644
--- a/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
+++ b/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
@@ -33,7 +33,7 @@
                 <ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>
             </Grid.ColumnDefinitions>
 
-            <TextBlock x:Name="TitleTextBlock" Text="DevHome PI" FontSize="10" Margin="10,0,0,0" HorizontalAlignment="Left" Grid.Column="1" VerticalAlignment="Center"/>
+            <TextBlock x:Uid="Title" FontSize="10" Margin="10,0,0,0" HorizontalAlignment="Left" Grid.Column="1" VerticalAlignment="Center"/>
             <StackPanel x:Name="ChromeButtonPanel" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0, 0, 10, 0"  Background="Transparent" Grid.Column="1">
                 <Button
                       x:Uid="SnapButton"
@@ -65,7 +65,7 @@
             </controls:ProcessSelectionButton>
 
             <!-- Per App controls -->
-            <Image x:Name="AppIcon" HorizontalAlignment="Center" Source="{x:Bind _viewModel.ApplicationIcon, Mode=OneWay}" Margin="5" Height="20" Width="20" Visibility="{x:Bind _viewModel.AppBarVisibility, Mode=OneWay}"/>
+            <Image x:Name="AppIcon" HorizontalAlignment="Center" Source="{x:Bind _viewModel.ApplicationIcon, Mode=OneWay}" ToolTipService.ToolTip="{x:Bind _viewModel.ApplicationName, Mode=OneWay}" Margin="5" Height="20" Width="20" Visibility="{x:Bind _viewModel.AppBarVisibility, Mode=OneWay}"/>
             <TextBlock x:Uid="AppPID" Text="{x:Bind _viewModel.ApplicationPid, Mode=OneWay}" FontFamily="Segoe UI" FontSize="10" Margin="5" VerticalAlignment="Center" Visibility="{x:Bind _viewModel.AppBarVisibility, Mode=OneWay}"/>
             <TextBlock x:Uid="AppCPUUsage" Text="{x:Bind _viewModel.AppCpuUsage, Mode=OneWay}" FontFamily="Segoe UI" FontSize="10" Margin="5" VerticalAlignment="Center" Visibility="{x:Bind _viewModel.AppBarVisibility, Mode=OneWay}"/>
 
@@ -73,7 +73,7 @@
             <Button x:Uid="SwitchLayoutButton" x:Name="SwitchLayoutButton" HorizontalAlignment="Center" Click="{x:Bind _viewModel.SwitchLayoutCommand}">
                 <TextBlock Text="&#xe8b4;"/>
             </Button>
-            <Button x:Name="LargeContentButton" Click="{x:Bind _viewModel.ShowBigWindowCommand}" HorizontalAlignment="Center">
+            <Button x:Name="LargeContentButton" x:Uid="LargeContentButton" Click="{x:Bind _viewModel.ShowBigWindowCommand}" HorizontalAlignment="Center">
                 <TextBlock Text="&#xe8a1;"/>
             </Button>
 
diff --git a/tools/PI/DevHome.PI/BarWindowVertical.xaml b/tools/PI/DevHome.PI/BarWindowVertical.xaml
index 5ef7f3c187..4bfd5ab645 100644
--- a/tools/PI/DevHome.PI/BarWindowVertical.xaml
+++ b/tools/PI/DevHome.PI/BarWindowVertical.xaml
@@ -29,14 +29,16 @@
         <StackPanel x:Name="ChromeButtonPanelVertical" Orientation="Vertical" HorizontalAlignment="Center" Margin="0, 10" Grid.Row="0">
             <TextBlock x:Name="GripTextBlock" Text="&#xe76f;&#xe76f;" FontSize="10" Margin="0" HorizontalAlignment="Center" FontFamily="Segoe Fluent Icons"  PointerPressed="Window_PointerPressed" PointerMoved="Window_PointerMoved" PointerReleased="Window_PointerReleased"/>
                 <Button
+                    x:Uid="SnapButton"
                     Margin="0,20, 0, 0"
                     Style="{StaticResource ChromeButton}"
                     HorizontalAlignment="Center"
                     IsEnabled="{x:Bind _viewModel.IsSnappingEnabled, Mode=OneWay}"
                     Click="{x:Bind _viewModel.PerformSnapCommand}" >
-                <TextBlock Text="{x:Bind _viewModel.CurrentSnapButtonText, Mode=OneWay}"/>
+                    <TextBlock Text="{x:Bind _viewModel.CurrentSnapButtonText, Mode=OneWay}"/>
                 </Button>
                 <Button
+                    x:Uid="VerticalCloseButton"
                     Style="{StaticResource ChromeButton}"
                     Click="CloseButton_Click" 
                     HorizontalAlignment="Center"
@@ -68,7 +70,7 @@
             </controls:ProcessSelectionButton>
 
             <!-- Per App controls -->
-            <Image x:Name="AppIcon" HorizontalAlignment="Center" Source="{x:Bind _viewModel.ApplicationIcon, Mode=OneWay}" Margin="5" Height="20" Width="20" Visibility="{x:Bind _viewModel.AppBarVisibility, Mode=OneWay}"/>
+            <Image x:Name="AppIcon" HorizontalAlignment="Center" Source="{x:Bind _viewModel.ApplicationIcon, Mode=OneWay}" ToolTipService.ToolTip="{x:Bind _viewModel.ApplicationName, Mode=OneWay}" Margin="5" Height="20" Width="20" Visibility="{x:Bind _viewModel.AppBarVisibility, Mode=OneWay}"/>
             <TextBlock x:Uid="AppPID" Text="{x:Bind _viewModel.ApplicationPid, Mode=OneWay}" FontFamily="Segoe UI" FontSize="10" Margin="5" HorizontalAlignment="Center" Visibility="{x:Bind _viewModel.AppBarVisibility, Mode=OneWay}"/>
             <TextBlock x:Uid="AppCPUUsage" Text="{x:Bind _viewModel.AppCpuUsage, Mode=OneWay}" FontFamily="Segoe UI" FontSize="10" Margin="5" HorizontalAlignment="Center" Visibility="{x:Bind _viewModel.AppBarVisibility, Mode=OneWay}"/>
            
@@ -76,7 +78,7 @@
             <Button x:Uid="SwitchLayoutButton" x:Name="SwitchLayoutButton" Click="{x:Bind _viewModel.SwitchLayoutCommand}" HorizontalAlignment="Center">
                 <TextBlock Text="&#xe8b4;"/>
             </Button>
-            <Button x:Name="LargeContentButton" Click="{x:Bind _viewModel.ShowBigWindowCommand}" HorizontalAlignment="Center">
+            <Button x:Name="LargeContentButton" x:Uid="LargeContentButton" Click="{x:Bind _viewModel.ShowBigWindowCommand}" HorizontalAlignment="Center">
                 <TextBlock Text="&#xe8a1;"/>
             </Button>
 
diff --git a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
index 2b44627fc7..ccc265a76d 100644
--- a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
+++ b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
@@ -129,14 +129,6 @@
     <value>Restore</value>
     <comment>Tooltip for the restore button in the BarWindow</comment>
   </data>
-  <data name="CloseAllMenuItem.Text" xml:space="preserve">
-    <value>End PI service</value>
-    <comment>The label for the close all menu item flyout. This will cause the program to terminate.</comment>
-  </data>
-  <data name="CloseAllMenuItem.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Close the PI window and the service</value>
-    <comment>The tooltip for the close all menu item flyout. This will cause the program to terminate.</comment>
-  </data>
   <data name="PinMenuItemText" xml:space="preserve">
     <value>Pin</value>
     <comment>A label for the menuitem to pin a tool on the bar.</comment>
@@ -849,4 +841,20 @@
     <value>Edit or delete existing tools</value>
     <comment>Header for the setting item to edit or delete tools from the product.</comment>
   </data>
+  <data name="ProcessChooserButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Select a process to investigate</value>
+    <comment>Describes using a button in PI's UX to investigate another process running on the system</comment>
+  </data>
+  <data name="SnapButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Attach the diagnostic bar to the target application</value>
+    <comment>Describes using a button in PI's UX</comment>
+  </data>
+  <data name="Title.Text" xml:space="preserve">
+    <value>Dev Home PI</value>
+    <comment>The product name</comment>
+  </data>
+  <data name="VerticalCloseButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Close</value>
+    <comment>Describes a button that will close PI's window</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs b/tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs
index 8f0a24dfb8..a598a2a55a 100644
--- a/tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs
+++ b/tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs
@@ -51,6 +51,9 @@ public partial class BarWindowViewModel : ObservableObject
     [ObservableProperty]
     private Visibility _appBarVisibility = Visibility.Visible;
 
+    [ObservableProperty]
+    private string? _applicationName;
+
     [ObservableProperty]
     private int _applicationPid;
 
@@ -85,6 +88,7 @@ public BarWindowViewModel()
 
         if (process != null)
         {
+            ApplicationName = process.ProcessName;
             ApplicationPid = process.Id;
             ApplicationIcon = TargetAppData.Instance.Icon;
         }
@@ -186,6 +190,7 @@ private void TargetApp_PropertyChanged(object? sender, PropertyChangedEventArgs
                 if (process is not null)
                 {
                     ApplicationPid = process.Id;
+                    ApplicationName = process.ProcessName;
                 }
             });
         }

From 36b299872a1c809cf853e3eb0dac2e860bf7057f Mon Sep 17 00:00:00 2001
From: Tim Kurtzman <49733346+timkur@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:33:42 -0700
Subject: [PATCH 2/2] PR updates

---
 tools/PI/DevHome.PI/BarWindowHorizontal.xaml         | 2 +-
 tools/PI/DevHome.PI/BarWindowVertical.xaml           | 2 +-
 tools/PI/DevHome.PI/Strings/en-us/Resources.resw     | 2 +-
 tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/PI/DevHome.PI/BarWindowHorizontal.xaml b/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
index 784ed28984..a6fc0adadb 100644
--- a/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
+++ b/tools/PI/DevHome.PI/BarWindowHorizontal.xaml
@@ -73,7 +73,7 @@
             <Button x:Uid="SwitchLayoutButton" x:Name="SwitchLayoutButton" HorizontalAlignment="Center" Click="{x:Bind _viewModel.SwitchLayoutCommand}">
                 <TextBlock Text="&#xe8b4;"/>
             </Button>
-            <Button x:Name="LargeContentButton" x:Uid="LargeContentButton" Click="{x:Bind _viewModel.ShowBigWindowCommand}" HorizontalAlignment="Center">
+            <Button x:Uid="SwitchToLargeLayoutButton" Click="{x:Bind _viewModel.ShowBigWindowCommand}" HorizontalAlignment="Center">
                 <TextBlock Text="&#xe8a1;"/>
             </Button>
 
diff --git a/tools/PI/DevHome.PI/BarWindowVertical.xaml b/tools/PI/DevHome.PI/BarWindowVertical.xaml
index 4bfd5ab645..278d3fa022 100644
--- a/tools/PI/DevHome.PI/BarWindowVertical.xaml
+++ b/tools/PI/DevHome.PI/BarWindowVertical.xaml
@@ -78,7 +78,7 @@
             <Button x:Uid="SwitchLayoutButton" x:Name="SwitchLayoutButton" Click="{x:Bind _viewModel.SwitchLayoutCommand}" HorizontalAlignment="Center">
                 <TextBlock Text="&#xe8b4;"/>
             </Button>
-            <Button x:Name="LargeContentButton" x:Uid="LargeContentButton" Click="{x:Bind _viewModel.ShowBigWindowCommand}" HorizontalAlignment="Center">
+            <Button x:Uid="SwitchToLargeLayoutButton" Click="{x:Bind _viewModel.ShowBigWindowCommand}" HorizontalAlignment="Center">
                 <TextBlock Text="&#xe8a1;"/>
             </Button>
 
diff --git a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
index ccc265a76d..081f93ecd4 100644
--- a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
+++ b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
@@ -145,7 +145,7 @@
     <value>Dissociate so that PI is not tracking any app</value>
     <comment>The tooltip for a button which causes PI to no longer track any app</comment>
   </data>
-  <data name="LargeContentButton.ToolTipService.ToolTip" xml:space="preserve">
+  <data name="SwitchToLargeLayoutButton.ToolTipService.ToolTip" xml:space="preserve">
     <value>Expand or collapse the large content panel</value>
     <comment>The tooltip for a button which expands or collapses the large content panel.</comment>
   </data>
diff --git a/tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs b/tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs
index a598a2a55a..fdeacc40b3 100644
--- a/tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs
+++ b/tools/PI/DevHome.PI/ViewModels/BarWindowViewModel.cs
@@ -52,7 +52,7 @@ public partial class BarWindowViewModel : ObservableObject
     private Visibility _appBarVisibility = Visibility.Visible;
 
     [ObservableProperty]
-    private string? _applicationName;
+    private string _applicationName = string.Empty;
 
     [ObservableProperty]
     private int _applicationPid;