mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-09-01 06:55:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[KBM]Change UI strings to mention remap to text (#30039)

Browse Source 
* [KBM]Change UI strings to mention remap to text

* Update src/modules/keyboardmanager/KeyboardManagerEditor/Resources.resx

Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>

* Update src/modules/keyboardmanager/KeyboardManagerEditor/Resources.resx

Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>

---------

Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>
This commit is contained in:
Jaime Bernardo
2023-11-27 14:15:17 +00:00
committed by GitHub
parent a090558aad
commit c6d605ea39
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/keyboardmanager/KeyboardManagerEditor/Resources.resx
View File

@@ -177,14 +177,14 @@
<value>Some of the shortcuts could not be remapped. Continue anyway?</value>
</data>
<data name="EditKeyboard_Info" xml:space="preserve">
<value>Select the key you want to change ("Select") and then the key or shortcut you want it to send ("To send").</value>
<value>Select the key you want to change ("Select") and then configure the key, shortcut or text you want it to send ("To send").</value>
</data>
<data name="EditKeyboard_InfoExample" xml:space="preserve">
<value>Example of a remapping: Select A and send "Ctrl+C", "A" would be your "Select" and "Ctrl+C" would be your "To send" command.</value>
<comment>Key on a keyboard</comment>
</data>
<data name="EditShortcuts_Info" xml:space="preserve">
<value>Select the shortcut you want to change ("Select") and then the key or shortcut you want it to invoke ("To send").</value>
<value>Select the shortcut you want to change ("Select") and then configure the key, shortcut or text you want it to send ("To send").</value>
<comment>Key on a keyboard</comment>
</data>
<data name="EditShortcuts_InfoExample" xml:space="preserve">
@@ -290,11 +290,8 @@
<data name="Mapping_Type_DropDown_Text" xml:space="preserve">
<value>Text</value>
</data>
<data name="Mapping_Type_DropDown_Shortcut" xml:space="preserve">
<value>Shortcut</value>
</data>
<data name="Mapping_Type_DropDown_Key" xml:space="preserve">
<value>Key</value>
<data name="Mapping_Type_DropDown_Key_Shortcut" xml:space="preserve">
<value>Key/Shortcut</value>
<comment>Key on a keyboard</comment>
</data>
<data name="Add_Key_Remap_Button" xml:space="preserve">

9
src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorStrings.h
View File

@@ -17,14 +17,9 @@ namespace KeyboardManagerEditorStrings
return GET_RESOURCE_STRING(IDS_MAPPING_TYPE_DROPDOWN_TEXT);
}
inline std::wstring MappingTypeShortcut()
inline std::wstring MappingTypeKeyShortcut()
{
return GET_RESOURCE_STRING(IDS_MAPPING_TYPE_DROPDOWN_SHORTCUT);
}
inline std::wstring MappingTypeKey()
{
return GET_RESOURCE_STRING(IDS_MAPPING_TYPE_DROPDOWN_KEY);
return GET_RESOURCE_STRING(IDS_MAPPING_TYPE_DROPDOWN_KEY_SHORTCUT);
}
// Function to return the error message

2
src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
View File

@@ -124,7 +124,7 @@ void ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, std::vector<s
auto typeCombo = ComboBox();
typeCombo.Width(EditorConstants::RemapTableDropDownWidth);
typeCombo.Items().Append(winrt::box_value(KeyboardManagerEditorStrings::MappingTypeShortcut()));
typeCombo.Items().Append(winrt::box_value(KeyboardManagerEditorStrings::MappingTypeKeyShortcut()));
typeCombo.Items().Append(winrt::box_value(KeyboardManagerEditorStrings::MappingTypeText()));
auto controlStackPanel = keyboardRemapControlObjects.back()[1]->shortcutControlLayout.as<StackPanel>();
auto firstLineStackPanel = keyboardRemapControlObjects.back()[1]->keyComboAndSelectStackPanel.as<StackPanel>();

2
src/modules/keyboardmanager/KeyboardManagerEditorLibrary/SingleKeyRemapControl.cpp
View File

@@ -77,7 +77,7 @@ SingleKeyRemapControl::SingleKeyRemapControl(StackPanel table, StackPanel row, c
auto typeCombo = ComboBox();
typeCombo.Width(EditorConstants::RemapTableDropDownWidth);
typeCombo.Items().Append(winrt::box_value(KeyboardManagerEditorStrings::MappingTypeKey()));
typeCombo.Items().Append(winrt::box_value(KeyboardManagerEditorStrings::MappingTypeKeyShortcut()));
typeCombo.Items().Append(winrt::box_value(KeyboardManagerEditorStrings::MappingTypeText()));
keyComboAndSelectStackPanel.Children().Append(typeCombo);
keyComboAndSelectStackPanel.Children().Append(typeKey.as<Button>());

4
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@@ -1495,10 +1495,10 @@
<value>Encoding</value>
</data>
<data name="KeyboardManager_RemapKeyboardButton.Description" xml:space="preserve">
<value>Remap keys to other keys or shortcuts</value>
<value>Remap keys to other keys, shortcuts or text snippets</value>
</data>
<data name="KeyboardManager_RemapShortcutsButton.Description" xml:space="preserve">
<value>Remap shortcuts to other shortcuts or keys for all or specific applications</value>
<value>Remap shortcuts to other shortcuts, keys or text snippets for all or specific applications</value>
</data>
<data name="General.ModuleDescription" xml:space="preserve">
<value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity.