maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update appearance

Browse source
This commit is contained in:
Mike Griese 2021-10-27 12:10:28 -05:00
parent 90b79624ca
commit 69f1068050
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/cascadia/TerminalApp/AdminWarningPlaceholder.xaml
View file

@ -43,28 +43,35 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
TextWrapping="WrapWholeWords" /> TextWrapping="WrapWholeWords" />
<TextBlock Margin="0,8,0,8" <TextBlock Margin="0,16,0,16"
HorizontalAlignment="Center" HorizontalAlignment="Left"
FontFamily="Cascadia Code" FontFamily="Cascadia Mono"
Text="{x:Bind Commandline, Mode=OneWay}" Text="{x:Bind Commandline, Mode=OneWay}"
TextWrapping="WrapWholeWords" /> TextWrapping="WrapWholeWords" />
<TextBlock x:Uid="ApproveCommandlineWarningSuffixTextBlock" <TextBlock x:Uid="ApproveCommandlineWarningSuffixTextBlock"
HorizontalAlignment="Left" HorizontalAlignment="Left"
TextWrapping="WrapWholeWords" /> TextWrapping="WrapWholeWords" />
<StackPanel HorizontalAlignment="Right" <Grid Margin="0,8,0,8"
Orientation="Horizontal"> HorizontalAlignment="Stretch"
XYFocusKeyboardNavigation="Enabled">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Button x:Name="PrimaryButton" <Button x:Name="PrimaryButton"
x:Uid="ApproveCommandlineWarning_PrimaryButton" x:Uid="ApproveCommandlineWarning_PrimaryButton"
Margin="8" Grid.Column="0"
HorizontalAlignment="Right" Margin="0,0,8,0"
HorizontalAlignment="Stretch"
Click="_primaryButtonClick" Click="_primaryButtonClick"
Style="{StaticResource AccentButtonStyle}" /> Style="{StaticResource AccentButtonStyle}" />
<Button x:Name="CancelButton" <Button x:Name="CancelButton"
x:Uid="ApproveCommandlineWarning_CancelButton" x:Uid="ApproveCommandlineWarning_CancelButton"
HorizontalAlignment="Right" Grid.Column="1"
HorizontalAlignment="Stretch"
Click="_cancelButtonClick" /> Click="_cancelButtonClick" />
</StackPanel> </Grid>
</StackPanel> </StackPanel>
</Border> </Border>
</Grid> </Grid>

2
src/cascadia/TerminalApp/Pane.cpp
View file

@ -144,7 +144,7 @@ NewTerminalArgs Pane::GetTerminalArgsForPane() const
args.Profile(controlSettings.ProfileName()); args.Profile(controlSettings.ProfileName());
// If we know the user's working directory use it instead of the profile. // If we know the user's working directory use it instead of the profile.
if (const auto dir = _control.WorkingDirectory(); !dir.empty()) if (const auto dir = termControl.WorkingDirectory(); !dir.empty())
{ {
args.StartingDirectory(dir); args.StartingDirectory(dir);
} }

4
src/cascadia/TerminalApp/Resources/en-US/Resources.resw
View file

@ -508,13 +508,13 @@
<value>Cancel</value> <value>Cancel</value>
</data> </data>
<data name="ApproveCommandlineWarningPrefixTextBlock.Text" xml:space="preserve"> <data name="ApproveCommandlineWarningPrefixTextBlock.Text" xml:space="preserve">
<value>You are about to execute the following commandline:</value> <value>You are about to execute the following command-line:</value>
</data> </data>
<data name="ApproveCommandlineWarningSuffixTextBlock.Text" xml:space="preserve"> <data name="ApproveCommandlineWarningSuffixTextBlock.Text" xml:space="preserve">
<value>Do you wish to continue?</value> <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 command-line</value>
</data> </data>
<data name="ApproveCommandlineWarningTitle.Text" xml:space="preserve"> <data name="ApproveCommandlineWarningTitle.Text" xml:space="preserve">
<value>Warning</value> <value>Warning</value>