From 58c6646132e933972da69eb19ad793ee0ed3d438 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Thu, 2 Sep 2021 11:01:11 -0500
Subject: [PATCH] Format that dialog with the actual commandline

---
 .../TerminalApp/AdminWarningPlaceholder.cpp   |  4 +-
 .../TerminalApp/AdminWarningPlaceholder.h     |  5 +--
 .../TerminalApp/AdminWarningPlaceholder.idl   |  5 ++-
 .../TerminalApp/AdminWarningPlaceholder.xaml  | 41 ++++++++++++++-----
 .../Resources/en-US/Resources.resw            |  7 +++-
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/cascadia/TerminalApp/AdminWarningPlaceholder.cpp b/src/cascadia/TerminalApp/AdminWarningPlaceholder.cpp
index 22ea4bfdf..01bd65cbf 100644
--- a/src/cascadia/TerminalApp/AdminWarningPlaceholder.cpp
+++ b/src/cascadia/TerminalApp/AdminWarningPlaceholder.cpp
@@ -12,7 +12,7 @@ namespace winrt::TerminalApp::implementation
 {
     AdminWarningPlaceholder::AdminWarningPlaceholder(const winrt::Microsoft::Terminal::Control::TermControl& control, const winrt::hstring& cmdline) :
         _control{ control },
-        _cmdline{ cmdline }
+        _Commandline{ cmdline }
     {
         InitializeComponent();
     }
@@ -30,6 +30,4 @@ namespace winrt::TerminalApp::implementation
     {
         return _control;
     }
-    winrt::hstring AdminWarningPlaceholder::Commandline() { return _cmdline; }
-
 }
diff --git a/src/cascadia/TerminalApp/AdminWarningPlaceholder.h b/src/cascadia/TerminalApp/AdminWarningPlaceholder.h
index 9970ec214..f9559740f 100644
--- a/src/cascadia/TerminalApp/AdminWarningPlaceholder.h
+++ b/src/cascadia/TerminalApp/AdminWarningPlaceholder.h
@@ -13,8 +13,8 @@ namespace winrt::TerminalApp::implementation
         AdminWarningPlaceholder(const winrt::Microsoft::Terminal::Control::TermControl& control, const winrt::hstring& cmdline);
 
         winrt::Windows::UI::Xaml::Controls::UserControl Control();
-        winrt::hstring Commandline();
-
+        WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, Commandline, _PropertyChangedHandlers);
         TYPED_EVENT(PrimaryButtonClicked, TerminalApp::AdminWarningPlaceholder, winrt::Windows::UI::Xaml::RoutedEventArgs);
         TYPED_EVENT(CancelButtonClicked, TerminalApp::AdminWarningPlaceholder, winrt::Windows::UI::Xaml::RoutedEventArgs);
 
@@ -22,7 +22,6 @@ namespace winrt::TerminalApp::implementation
         friend struct AdminWarningPlaceholderT<AdminWarningPlaceholder>; // friend our parent so it can bind private event handlers
 
         winrt::Microsoft::Terminal::Control::TermControl _control{ nullptr };
-        winrt::hstring _cmdline;
 
         void _primaryButtonClick(winrt::Windows::Foundation::IInspectable const& sender,
                                  winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
diff --git a/src/cascadia/TerminalApp/AdminWarningPlaceholder.idl b/src/cascadia/TerminalApp/AdminWarningPlaceholder.idl
index ce5a34a86..cfe9586fe 100644
--- a/src/cascadia/TerminalApp/AdminWarningPlaceholder.idl
+++ b/src/cascadia/TerminalApp/AdminWarningPlaceholder.idl
@@ -3,8 +3,9 @@
 
 namespace TerminalApp
 {
-    [default_interface] runtimeclass AdminWarningPlaceholder : Windows.UI.Xaml.Controls.UserControl
+    [default_interface] runtimeclass AdminWarningPlaceholder : Windows.UI.Xaml.Controls.UserControl,
+                                                               Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
-        // AdminWarningPlaceholder();
+        String Commandline { get; };
     }
 }
diff --git a/src/cascadia/TerminalApp/AdminWarningPlaceholder.xaml b/src/cascadia/TerminalApp/AdminWarningPlaceholder.xaml
index 546f79baf..e8bf5063a 100644
--- a/src/cascadia/TerminalApp/AdminWarningPlaceholder.xaml
+++ b/src/cascadia/TerminalApp/AdminWarningPlaceholder.xaml
@@ -14,26 +14,45 @@
     <Grid HorizontalAlignment="Center"
           VerticalAlignment="Center">
         <Border Margin="8,8,8,8"
-                Padding="8,8,8,8"
+                Padding="16,8,16,8"
                 Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
                 BorderBrush="{ThemeResource SystemAccentColor}"
                 BorderThickness="2,2,2,2"
                 CornerRadius="{ThemeResource OverlayCornerRadius}">
-            <StackPanel>
+            <StackPanel Orientation="Vertical">
                 <TextBlock x:Uid="ApproveCommandlineWarningTitle"
+                           Padding="0,0,0,16"
                            HorizontalAlignment="Left"
+                           FontSize="20"
+                           FontWeight="Normal"
                            TextWrapping="WrapWholeWords" />
-                <TextBlock x:Uid="ApproveCommandlineWarningTextBlock"
+
+                <TextBlock x:Uid="ApproveCommandlineWarningPrefixTextBlock"
                            HorizontalAlignment="Center"
                            TextWrapping="WrapWholeWords" />
-                <Button x:Name="PrimaryButton"
-                        x:Uid="ApproveCommandlineWarning_PrimaryButton"
-                        HorizontalAlignment="Right"
-                        Click="_primaryButtonClick" />
-                <Button x:Name="CancelButton"
-                        x:Uid="ApproveCommandlineWarning_CancelButton"
-                        HorizontalAlignment="Right"
-                        Click="_cancelButtonClick" />
+
+                <TextBlock Margin="0,8,0,8"
+                           HorizontalAlignment="Center"
+                           FontFamily="Cascadia Code"
+                           Text="{x:Bind Commandline, Mode=OneWay}"
+                           TextWrapping="WrapWholeWords" />
+
+                <TextBlock x:Uid="ApproveCommandlineWarningSuffixTextBlock"
+                           HorizontalAlignment="Left"
+                           TextWrapping="WrapWholeWords" />
+                <StackPanel HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                    <Button x:Name="PrimaryButton"
+                            x:Uid="ApproveCommandlineWarning_PrimaryButton"
+                            Margin="8"
+                            HorizontalAlignment="Right"
+                            Click="_primaryButtonClick"
+                            Style="{StaticResource AccentButtonStyle}" />
+                    <Button x:Name="CancelButton"
+                            x:Uid="ApproveCommandlineWarning_CancelButton"
+                            HorizontalAlignment="Right"
+                            Click="_cancelButtonClick" />
+                </StackPanel>
             </StackPanel>
         </Border>
     </Grid>
diff --git a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
index 3104e6649..1fd0ee029 100644
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -489,8 +489,11 @@
   <data name="ApproveCommandlineWarning_CancelButton.Content" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="ApproveCommandlineWarningTextBlock.Text" xml:space="preserve">
-    <value>You are about t execute the following commandline. {TODO! format this}. Do you wish to continue?</value>
+  <data name="ApproveCommandlineWarningPrefixTextBlock.Text" xml:space="preserve">
+    <value>You are about to execute the following commandline:</value>
+  </data>
+  <data name="ApproveCommandlineWarningSuffixTextBlock.Text" xml:space="preserve">
+    <value>Do you wish to continue?</value>
   </data>
   <data name="ApproveCommandlineWarning_PrimaryButton.Content" xml:space="preserve">
     <value>Allow Commandline</value>