Skip to content

Commit

Permalink
Remove redundant tooltips from settings UI (#14244)
Browse files Browse the repository at this point in the history
This removes all of the redundant tooltips from the settings UI. Since all of the settings are added through the SettingsContainer, it's a pretty simple change.

Closes #14184

- [X] hover over all settings in the settings UI
- [X] hover over all entries in the SUI nav view

(cherry picked from commit 3eaa781)
Service-Card-Id: 86390068
Service-Version: 1.15
  • Loading branch information
carlos-zamora authored and DHowett committed Dec 1, 2022
1 parent faad1b1 commit 4f1a72a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 31 deletions.
2 changes: 0 additions & 2 deletions src/cascadia/TerminalSettingsEditor/MainPage.cpp
Expand Up @@ -502,15 +502,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
if (!profile.Deleted())
{
auto navItem = _CreateProfileNavViewItem(_viewModelForProfile(profile, _settingsClone));
Controls::ToolTipService::SetToolTip(navItem, box_value(profile.Name()));
menuItems.Append(navItem);
}
}

// Top off (the end of the nav view) with the Add Profile item
MUX::Controls::NavigationViewItem addProfileItem;
addProfileItem.Content(box_value(RS_(L"Nav_AddNewProfile/Content")));
Controls::ToolTipService::SetToolTip(addProfileItem, box_value(RS_(L"Nav_AddNewProfile/Content")));
addProfileItem.Tag(box_value(addProfileTag));

FontIcon icon;
Expand Down
28 changes: 0 additions & 28 deletions src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
Expand Up @@ -463,34 +463,18 @@
<value>Appearance</value>
<comment>Header for the "appearance" menu item. This navigates to a page that lets you see and modify settings related to the app's appearance.</comment>
</data>
<data name="Nav_Appearance.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Appearance</value>
<comment>Tooltip for the "appearance" menu item.</comment>
</data>
<data name="Nav_ColorSchemes.Content" xml:space="preserve">
<value>Color schemes</value>
<comment>Header for the "color schemes" menu item. This navigates to a page that lets you see and modify schemes of colors that can be used by the terminal.</comment>
</data>
<data name="Nav_ColorSchemes.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Color schemes</value>
<comment>Tooltip for the "color schemes" menu item.</comment>
</data>
<data name="Nav_Interaction.Content" xml:space="preserve">
<value>Interaction</value>
<comment>Header for the "interaction" menu item. This navigates to a page that lets you see and modify settings related to the user's mouse and touch interactions with the app.</comment>
</data>
<data name="Nav_Interaction.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Interaction</value>
<comment>Tooltip for the "interaction" menu item.</comment>
</data>
<data name="Nav_Launch.Content" xml:space="preserve">
<value>Startup</value>
<comment>Header for the "startup" menu item. This navigates to a page that lets you see and modify settings related to the app's launch experience (i.e. screen position, mode, etc.)</comment>
</data>
<data name="Nav_Launch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Startup</value>
<comment>Tooltip for the "startup" menu item.</comment>
</data>
<data name="Nav_OpenJSON.Content" xml:space="preserve">
<value>Open JSON file</value>
<comment>Header for a menu item. This opens the JSON file that is used to log the app's settings.</comment>
Expand All @@ -499,26 +483,14 @@
<value>Defaults</value>
<comment>Header for the "defaults" menu item. This navigates to a page that lets you see and modify settings that affect profiles. This is the lowest layer of profile settings that all other profile settings are based on. If a profile doesn't define a setting, this page is responsible for figuring out what that setting is supposed to be.</comment>
</data>
<data name="Nav_ProfileDefaults.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Defaults</value>
<comment>Tooltip for the "profile defaults" menu item.</comment>
</data>
<data name="Nav_Rendering.Content" xml:space="preserve">
<value>Rendering</value>
<comment>Header for the "rendering" menu item. This navigates to a page that lets you see and modify settings related to the app's rendering of text in the terminal.</comment>
</data>
<data name="Nav_Rendering.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Rendering</value>
<comment>Tooltip for the "rendering" menu item.</comment>
</data>
<data name="Nav_Actions.Content" xml:space="preserve">
<value>Actions</value>
<comment>Header for the "actions" menu item. This navigates to a page that lets you see and modify commands, key bindings, and actions that can be done in the app.</comment>
</data>
<data name="Nav_Actions.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Actions</value>
<comment>Tooltip for the "actions" menu item.</comment>
</data>
<data name="Profile_OpacitySlider.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Background opacity</value>
<comment>Name for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
Expand Down
1 change: 0 additions & 1 deletion src/cascadia/TerminalSettingsEditor/SettingContainer.cpp
Expand Up @@ -153,7 +153,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
// apply help text as tooltip and full description (automation property)
if (const auto& helpText{ HelpText() }; !helpText.empty())
{
Controls::ToolTipService::SetToolTip(base, box_value(helpText));
Automation::AutomationProperties::SetFullDescription(base, helpText);
}
}
Expand Down

0 comments on commit 4f1a72a

Please sign in to comment.