starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-04-06 14:19:45 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Get names from the resources if provided as an object, not a string

Browse Source
This commit is contained in:
Mike Griese
2020-05-28 12:56:17 -05:00
parent 75af4cabbb
commit 33a9e32736
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/cascadia/TerminalApp/CommandSerialization.cpp
View File

@@ -8,6 +8,8 @@
// #include "ShortcutActionSerializationKeys.h"
#include <winrt/Microsoft.Terminal.Settings.h>
#include <LibraryResources.h>
using namespace winrt::Microsoft::Terminal::Settings;
using namespace winrt::TerminalApp;
@@ -62,7 +64,22 @@ winrt::TerminalApp::Command CommandSerialization::FromJson(const Json::Value& js
if (auto name{ json[JsonKey(NameKey)] })
{
result.Name(winrt::to_hstring(name.asString()));
if (name.isObject())
{
try
{
if (auto keyJson{ name[JsonKey("key")] })
{
auto resourceKey = GetWstringFromJson(keyJson);
result.Name(GetLibraryResourceString(resourceKey));
}
}
CATCH_LOG();
}
else if (name.isString())
{
result.Name(winrt::to_hstring(name.asString()));
}
}
if (auto iconPath{ json[JsonKey(IconPathKey)] })
{