starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-07-09 02:26:45 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Add tooltips to context menus (#14058)

Browse Source 
Add tooltips to the tab context menu and the tab dropdown menu.

Closes #13243
This commit is contained in:
Kayla Cinnamon
2022-09-30 11:04:27 -07:00
committed by GitHub
parent fc0ef37977
commit 54dc2c4432
4 changed files with 92 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/cascadia/TerminalApp/Resources/en-US/Resources.resw
View File

@@ -746,4 +746,40 @@
<value>Suggestions found: {0}</value>
<comment>{0} will be replaced with a number.</comment>
</data>
<data name="AboutToolTip" xml:space="preserve">
<value>Open a dialog containing product information</value>
</data>
<data name="ChooseColorToolTip" xml:space="preserve">
<value>Open the color picker to choose the color of this tab</value>
</data>
<data name="CommandPaletteToolTip" xml:space="preserve">
<value>Open the command palette</value>
</data>
<data name="DuplicateTabToolTip" xml:space="preserve">
<value>Open a new tab using the active profile in the current directory</value>
</data>
<data name="ExportTabToolTip" xml:space="preserve">
<value>Export the contents of the text buffer into a text file</value>
</data>
<data name="FindToolTip" xml:space="preserve">
<value>Open the search dialog</value>
</data>
<data name="RenameTabToolTip" xml:space="preserve">
<value>Rename this tab</value>
</data>
<data name="SettingsToolTip" xml:space="preserve">
<value>Open the settings page</value>
</data>
<data name="SplitTabToolTip" xml:space="preserve">
<value>Open a new pane using the active profile in the current directory</value>
</data>
<data name="TabCloseAfterToolTip" xml:space="preserve">
<value>Close all tabs to the right of this tab</value>
</data>
<data name="TabCloseOtherToolTip" xml:space="preserve">
<value>Close all tabs except this tab</value>
</data>
<data name="TabCloseToolTip" xml:space="preserve">
<value>Close this tab</value>
</data>
</root>

12
src/cascadia/TerminalApp/TabBase.cpp
View File

@@ -79,6 +79,10 @@ namespace winrt::TerminalApp::implementation
}
});
_closeTabsAfterMenuItem.Text(RS_(L"TabCloseAfter"));
const auto closeTabsAfterToolTip = RS_(L"TabCloseAfterToolTip");
WUX::Controls::ToolTipService::SetToolTip(_closeTabsAfterMenuItem, box_value(closeTabsAfterToolTip));
Automation::AutomationProperties::SetHelpText(_closeTabsAfterMenuItem, closeTabsAfterToolTip);
// Close other tabs
_closeOtherTabsMenuItem.Click([weakThis](auto&&, auto&&) {
@@ -88,6 +92,10 @@ namespace winrt::TerminalApp::implementation
}
});
_closeOtherTabsMenuItem.Text(RS_(L"TabCloseOther"));
const auto closeOtherTabsToolTip = RS_(L"TabCloseOtherToolTip");
WUX::Controls::ToolTipService::SetToolTip(_closeOtherTabsMenuItem, box_value(closeOtherTabsToolTip));
Automation::AutomationProperties::SetHelpText(_closeOtherTabsMenuItem, closeOtherTabsToolTip);
// Close
Controls::MenuFlyoutItem closeTabMenuItem;
@@ -103,6 +111,10 @@ namespace winrt::TerminalApp::implementation
});
closeTabMenuItem.Text(RS_(L"TabClose"));
closeTabMenuItem.Icon(closeSymbol);
const auto closeTabToolTip = RS_(L"TabCloseToolTip");
WUX::Controls::ToolTipService::SetToolTip(closeTabMenuItem, box_value(closeTabToolTip));
Automation::AutomationProperties::SetHelpText(closeTabMenuItem, closeTabToolTip);
// GH#8238 append the close menu items to the flyout itself until crash in XAML is fixed
//Controls::MenuFlyoutSubItem closeSubMenu;

12
src/cascadia/TerminalApp/TerminalPage.cpp
View File

@@ -923,6 +923,10 @@ namespace winrt::TerminalApp::implementation
// Create the settings button.
auto settingsItem = WUX::Controls::MenuFlyoutItem{};
settingsItem.Text(RS_(L"SettingsMenuItem"));
const auto settingsToolTip = RS_(L"SettingsToolTip");
WUX::Controls::ToolTipService::SetToolTip(settingsItem, box_value(settingsToolTip));
Automation::AutomationProperties::SetHelpText(settingsItem, settingsToolTip);
WUX::Controls::SymbolIcon ico{};
ico.Symbol(WUX::Controls::Symbol::Setting);
@@ -940,6 +944,10 @@ namespace winrt::TerminalApp::implementation
// Create the command palette button.
auto commandPaletteFlyout = WUX::Controls::MenuFlyoutItem{};
commandPaletteFlyout.Text(RS_(L"CommandPaletteMenuItem"));
const auto commandPaletteToolTip = RS_(L"CommandPaletteToolTip");
WUX::Controls::ToolTipService::SetToolTip(commandPaletteFlyout, box_value(commandPaletteToolTip));
Automation::AutomationProperties::SetHelpText(commandPaletteFlyout, commandPaletteToolTip);
WUX::Controls::FontIcon commandPaletteIcon{};
commandPaletteIcon.Glyph(L"\xE945");
@@ -959,6 +967,10 @@ namespace winrt::TerminalApp::implementation
// Create the about button.
auto aboutFlyout = WUX::Controls::MenuFlyoutItem{};
aboutFlyout.Text(RS_(L"AboutMenuItem"));
const auto aboutToolTip = RS_(L"AboutToolTip");
WUX::Controls::ToolTipService::SetToolTip(aboutFlyout, box_value(aboutToolTip));
Automation::AutomationProperties::SetHelpText(aboutFlyout, aboutToolTip);
WUX::Controls::SymbolIcon aboutIcon{};
aboutIcon.Symbol(WUX::Controls::Symbol::Help);

34
src/cascadia/TerminalApp/TerminalTab.cpp
View File

@@ -1230,6 +1230,11 @@ namespace winrt::TerminalApp::implementation
chooseColorMenuItem.Text(RS_(L"TabColorChoose"));
chooseColorMenuItem.Icon(colorPickSymbol);
const auto chooseColorToolTip = RS_(L"ChooseColorToolTip");
WUX::Controls::ToolTipService::SetToolTip(chooseColorMenuItem, box_value(chooseColorToolTip));
Automation::AutomationProperties::SetHelpText(chooseColorMenuItem, chooseColorToolTip);
Controls::MenuFlyoutItem renameTabMenuItem;
{
// "Rename Tab"
@@ -1245,6 +1250,11 @@ namespace winrt::TerminalApp::implementation
});
renameTabMenuItem.Text(RS_(L"RenameTabText"));
renameTabMenuItem.Icon(renameTabSymbol);
const auto renameTabToolTip = RS_(L"RenameTabToolTip");
WUX::Controls::ToolTipService::SetToolTip(renameTabMenuItem, box_value(renameTabToolTip));
Automation::AutomationProperties::SetHelpText(renameTabMenuItem, renameTabToolTip);
}
Controls::MenuFlyoutItem duplicateTabMenuItem;
@@ -1262,6 +1272,11 @@ namespace winrt::TerminalApp::implementation
});
duplicateTabMenuItem.Text(RS_(L"DuplicateTabText"));
duplicateTabMenuItem.Icon(duplicateTabSymbol);
const auto duplicateTabToolTip = RS_(L"DuplicateTabToolTip");
WUX::Controls::ToolTipService::SetToolTip(duplicateTabMenuItem, box_value(duplicateTabToolTip));
Automation::AutomationProperties::SetHelpText(duplicateTabMenuItem, duplicateTabToolTip);
}
Controls::MenuFlyoutItem splitTabMenuItem;
@@ -1279,11 +1294,16 @@ namespace winrt::TerminalApp::implementation
});
splitTabMenuItem.Text(RS_(L"SplitTabText"));
splitTabMenuItem.Icon(splitTabSymbol);
const auto splitTabToolTip = RS_(L"SplitTabToolTip");
WUX::Controls::ToolTipService::SetToolTip(splitTabMenuItem, box_value(splitTabToolTip));
Automation::AutomationProperties::SetHelpText(splitTabMenuItem, splitTabToolTip);
}
Controls::MenuFlyoutItem exportTabMenuItem;
{
// "Split Tab"
// "Export Tab"
Controls::FontIcon exportTabSymbol;
exportTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
exportTabSymbol.Glyph(L"\xE74E"); // Save
@@ -1296,11 +1316,16 @@ namespace winrt::TerminalApp::implementation
});
exportTabMenuItem.Text(RS_(L"ExportTabText"));
exportTabMenuItem.Icon(exportTabSymbol);
const auto exportTabToolTip = RS_(L"ExportTabToolTip");
WUX::Controls::ToolTipService::SetToolTip(exportTabMenuItem, box_value(exportTabToolTip));
Automation::AutomationProperties::SetHelpText(exportTabMenuItem, exportTabToolTip);
}
Controls::MenuFlyoutItem findMenuItem;
{
// "Split Tab"
// "Find"
Controls::FontIcon findSymbol;
findSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
findSymbol.Glyph(L"\xF78B"); // SearchMedium
@@ -1313,6 +1338,11 @@ namespace winrt::TerminalApp::implementation
});
findMenuItem.Text(RS_(L"FindText"));
findMenuItem.Icon(findSymbol);
const auto findToolTip = RS_(L"FindToolTip");
WUX::Controls::ToolTipService::SetToolTip(findMenuItem, box_value(findToolTip));
Automation::AutomationProperties::SetHelpText(findMenuItem, findToolTip);
}
// Build the menu