Format that dialog with the actual commandline
This commit is contained in:
parent
9b32681ae1
commit
58c6646132
|
@ -12,7 +12,7 @@ namespace winrt::TerminalApp::implementation
|
||||||
{
|
{
|
||||||
AdminWarningPlaceholder::AdminWarningPlaceholder(const winrt::Microsoft::Terminal::Control::TermControl& control, const winrt::hstring& cmdline) :
|
AdminWarningPlaceholder::AdminWarningPlaceholder(const winrt::Microsoft::Terminal::Control::TermControl& control, const winrt::hstring& cmdline) :
|
||||||
_control{ control },
|
_control{ control },
|
||||||
_cmdline{ cmdline }
|
_Commandline{ cmdline }
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
@ -30,6 +30,4 @@ namespace winrt::TerminalApp::implementation
|
||||||
{
|
{
|
||||||
return _control;
|
return _control;
|
||||||
}
|
}
|
||||||
winrt::hstring AdminWarningPlaceholder::Commandline() { return _cmdline; }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,8 +13,8 @@ namespace winrt::TerminalApp::implementation
|
||||||
AdminWarningPlaceholder(const winrt::Microsoft::Terminal::Control::TermControl& control, const winrt::hstring& cmdline);
|
AdminWarningPlaceholder(const winrt::Microsoft::Terminal::Control::TermControl& control, const winrt::hstring& cmdline);
|
||||||
|
|
||||||
winrt::Windows::UI::Xaml::Controls::UserControl Control();
|
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(PrimaryButtonClicked, TerminalApp::AdminWarningPlaceholder, winrt::Windows::UI::Xaml::RoutedEventArgs);
|
||||||
TYPED_EVENT(CancelButtonClicked, 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
|
friend struct AdminWarningPlaceholderT<AdminWarningPlaceholder>; // friend our parent so it can bind private event handlers
|
||||||
|
|
||||||
winrt::Microsoft::Terminal::Control::TermControl _control{ nullptr };
|
winrt::Microsoft::Terminal::Control::TermControl _control{ nullptr };
|
||||||
winrt::hstring _cmdline;
|
|
||||||
|
|
||||||
void _primaryButtonClick(winrt::Windows::Foundation::IInspectable const& sender,
|
void _primaryButtonClick(winrt::Windows::Foundation::IInspectable const& sender,
|
||||||
winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
|
winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
|
||||||
|
|
|
@ -3,8 +3,9 @@
|
||||||
|
|
||||||
namespace TerminalApp
|
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; };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,26 +14,45 @@
|
||||||
<Grid HorizontalAlignment="Center"
|
<Grid HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center">
|
VerticalAlignment="Center">
|
||||||
<Border Margin="8,8,8,8"
|
<Border Margin="8,8,8,8"
|
||||||
Padding="8,8,8,8"
|
Padding="16,8,16,8"
|
||||||
Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
|
Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
|
||||||
BorderBrush="{ThemeResource SystemAccentColor}"
|
BorderBrush="{ThemeResource SystemAccentColor}"
|
||||||
BorderThickness="2,2,2,2"
|
BorderThickness="2,2,2,2"
|
||||||
CornerRadius="{ThemeResource OverlayCornerRadius}">
|
CornerRadius="{ThemeResource OverlayCornerRadius}">
|
||||||
<StackPanel>
|
<StackPanel Orientation="Vertical">
|
||||||
<TextBlock x:Uid="ApproveCommandlineWarningTitle"
|
<TextBlock x:Uid="ApproveCommandlineWarningTitle"
|
||||||
|
Padding="0,0,0,16"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
|
FontSize="20"
|
||||||
|
FontWeight="Normal"
|
||||||
TextWrapping="WrapWholeWords" />
|
TextWrapping="WrapWholeWords" />
|
||||||
<TextBlock x:Uid="ApproveCommandlineWarningTextBlock"
|
|
||||||
|
<TextBlock x:Uid="ApproveCommandlineWarningPrefixTextBlock"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
TextWrapping="WrapWholeWords" />
|
TextWrapping="WrapWholeWords" />
|
||||||
<Button x:Name="PrimaryButton"
|
|
||||||
x:Uid="ApproveCommandlineWarning_PrimaryButton"
|
<TextBlock Margin="0,8,0,8"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Center"
|
||||||
Click="_primaryButtonClick" />
|
FontFamily="Cascadia Code"
|
||||||
<Button x:Name="CancelButton"
|
Text="{x:Bind Commandline, Mode=OneWay}"
|
||||||
x:Uid="ApproveCommandlineWarning_CancelButton"
|
TextWrapping="WrapWholeWords" />
|
||||||
HorizontalAlignment="Right"
|
|
||||||
Click="_cancelButtonClick" />
|
<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>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
|
@ -489,8 +489,11 @@
|
||||||
<data name="ApproveCommandlineWarning_CancelButton.Content" xml:space="preserve">
|
<data name="ApproveCommandlineWarning_CancelButton.Content" xml:space="preserve">
|
||||||
<value>Cancel</value>
|
<value>Cancel</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ApproveCommandlineWarningTextBlock.Text" xml:space="preserve">
|
<data name="ApproveCommandlineWarningPrefixTextBlock.Text" xml:space="preserve">
|
||||||
<value>You are about t execute the following commandline. {TODO! format this}. Do you wish to continue?</value>
|
<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>
|
||||||
<data name="ApproveCommandlineWarning_PrimaryButton.Content" xml:space="preserve">
|
<data name="ApproveCommandlineWarning_PrimaryButton.Content" xml:space="preserve">
|
||||||
<value>Allow Commandline</value>
|
<value>Allow Commandline</value>
|
||||||
|
|
Loading…
Reference in a new issue