Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing settings to Settings UI #8116

Merged
merged 4 commits into from
Oct 30, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ the MIT License. See LICENSE in the project root for license information. -->
<RadioButton x:Uid="Globals_TabWidthModeCompact" x:Name="CompactTabWidthMode"/>
</Controls:RadioButtons>
<CheckBox x:Uid="Globals_ConfirmCloseAllTabs" IsChecked="{x:Bind GlobalSettings.ConfirmCloseAllTabs, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_DisableAnimations" IsChecked="{x:Bind GlobalSettings.DisableAnimations, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
</StackPanel>
</Grid>
</ScrollViewer>
Expand Down
2 changes: 2 additions & 0 deletions src/cascadia/TerminalSettingsEditor/Launch.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ the MIT License. See LICENSE in the project root for license information. -->
<RadioButton x:Uid="Globals_LaunchSizeDefault" x:Name="DefaultLaunchSize"/>
<RadioButton x:Uid="Globals_LaunchSizeMaximized" x:Name="MaximizedLaunchSize"/>
<RadioButton x:Uid="Globals_LaunchSizeFullscreen" x:Name="FullscreenLaunchSize"/>
<RadioButton x:Uid="Globals_LaunchSizeFocus" x:Name="FocusLaunchSize"/>
<RadioButton x:Uid="Globals_LaunchSizeMaximizedFocus" x:Name="MaximizedFocusLaunchSize"/>
</Controls:RadioButtons>
<!--TODO: Converter here for launch position into the cols and rows number boxes-->
<!--<TextBox x:Uid="Globals_LaunchPosition" Text="{x:Bind GlobalSettings.LaunchPosition, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse"/>
Expand Down
4 changes: 4 additions & 0 deletions src/cascadia/TerminalSettingsEditor/Profiles.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,10 @@ the MIT License. See LICENSE in the project root for license information. -->
<RadioButton x:Uid="Profile_CloseOnExitAlways" x:Name="closeOnExitAlways"/>
<RadioButton x:Uid="Profile_CloseOnExitNever" x:Name="closeOnExitNever"/>
</Controls:RadioButtons>
<Controls:RadioButtons x:Uid="Profile_BellStyle" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse">
<RadioButton x:Uid="Profile_BellStyleNone" x:Name="bellStyleNone"/>
<RadioButton x:Uid="Profile_BellStyleAudible" x:Name="bellStyleAudible"/>
</Controls:RadioButtons>
</StackPanel>
</Grid>
</PivotItem>
Expand Down
34 changes: 30 additions & 4 deletions src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,6 @@
<data name="Globals_DisableDynamicProfiles.Content" xml:space="preserve">
<value>Automatically create new profiles when new shells are installed</value>
</data>
<data name="Globals_DisableDynamicProfiles.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Enables all of the dynamic profile generators, adding their profiles to the list of profiles on startup.</value>
</data>
<data name="Globals_ForceFullRepaint.Content" xml:space="preserve">
<value>Redraw entire screen when display updates</value>
</data>
Expand Down Expand Up @@ -251,7 +248,8 @@
<value>Launch size</value>
</data>
<data name="Globals_LaunchSize.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Defines whether the terminal will launch in a window, maximized, or full screen.</value>
<value>Defines whether the terminal will launch as maximized, full screen, or in a window. Setting this to "Focus" is equivalent to launching the terminal in the "Default" mode, but with the focus mode enabled. Similar, setting this to "Maximized Focus" will result in launching the terminal in a maximized window with the focus mode enabled.</value>
carlos-zamora marked this conversation as resolved.
Show resolved Hide resolved
<comment>"Focus", "Default", and "Maximized Focus" must match Globals_LaunchSizeFocus.Content, Globals_LaunchSizeDefault.Content, and Globals_LaunchSizeMaximizedFocus.Content values respectively.</comment>
</data>
<data name="Globals_LaunchSizeDefault.Content" xml:space="preserve">
<value>Default</value>
Expand Down Expand Up @@ -652,4 +650,32 @@
<value>⚠ You have unsaved changes.</value>
<comment>{Locked="⚠"}</comment>
</data>
<data name="Globals_LaunchSizeFocus.Content" xml:space="preserve">
<value>Focus</value>
</data>
<data name="Globals_LaunchSizeMaximizedFocus.Content" xml:space="preserve">
<value>Maximized Focus</value>
</data>
<data name="Profile_BellStyle.Header" xml:space="preserve">
<value>Notification style for BEL character</value>
</data>
<data name="Profile_BellStyle.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Controls what happens when the application emits a BEL character. When set to "Audible", the Terminal will play a sound. When set to "None", nothing will happen.</value>
carlos-zamora marked this conversation as resolved.
Show resolved Hide resolved
<comment>"Audible" and "None" must match the values for Profile_BellStyleAudible.Content and Profile_BellStyleNone.Content respectively.</comment>
</data>
<data name="Profile_BellStyleAudible.Content" xml:space="preserve">
<value>Audible</value>
</data>
<data name="Profile_BellStyleNone.Content" xml:space="preserve">
<value>None</value>
</data>
<data name="Globals_DisableAnimations.Content" xml:space="preserve">
<value>Disable visual animations</value>
</data>
<data name="Globals_DisableAnimations.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>When checked, visual animations will be disabled across the application.</value>
</data>
<data name="Globals_DisableDynamicProfiles.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Enables all of the dynamic profile generators, adding their profiles to the list of profiles on startup.</value>
</data>
</root>