From 8f7daa9bd100345d7e23639604c9a3a50ce6448b Mon Sep 17 00:00:00 2001 From: rtk0c Date: Fri, 11 Jun 2021 13:35:35 -0700 Subject: Convert runtime-loaded l10n to string literals chosen at compile time --- core/src/UI/UI_Workflows.cpp | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'core/src/UI/UI_Workflows.cpp') diff --git a/core/src/UI/UI_Workflows.cpp b/core/src/UI/UI_Workflows.cpp index 3230cf9..4535f08 100644 --- a/core/src/UI/UI_Workflows.cpp +++ b/core/src/UI/UI_Workflows.cpp @@ -7,9 +7,10 @@ #include "Model/Workflow/Nodes/TextNodes.hpp" #include "Model/Workflow/Nodes/UserInputNodes.hpp" #include "Model/Workflow/Workflow.hpp" -#include "UI/Localization.hpp" +#include "Utils/I18n.hpp" #include "Utils/Macros.hpp" +#include #include #include #include @@ -162,8 +163,6 @@ public: void Draw() { - auto ls = LocaleStrings::Instance.get(); - ImNodes::SetCurrentEditor(mContext); ImNodes::Begin(""); @@ -278,7 +277,7 @@ public: auto& node = *mWorkflow->GetNodeByNodeId(mContextMenuNodeId); node.DrawDebugInfo(); - if (ImGui::MenuItem(ls->Delete.Get())) { + if (ImGui::MenuItem(ICON_FA_TRASH " " I18N_TEXT("Delete", L10N_DELETE))) { ImNodes::DeleteNode(mContextMenuNodeId); } @@ -293,7 +292,7 @@ public: node->DrawInputPinDebugInfo(pinId); } - if (ImGui::MenuItem(ls->Disconnect.Get())) { + if (ImGui::MenuItem(ICON_FA_UNLINK " " I18N_TEXT("Disconnect", L10N_DISCONNECT))) { if (isOutput) { auto& pin = node->GetOutputPin(pinId); if (pin.IsConnected()) { @@ -318,7 +317,7 @@ public: auto& conn = *mWorkflow->GetConnectionByLinkId(mContextMenuLinkId); conn.DrawDebugInfo(); - if (ImGui::MenuItem(ls->Delete.Get())) { + if (ImGui::MenuItem(ICON_FA_TRASH " " I18N_TEXT("Delete", L10N_DELETE))) { ImNodes::DeleteLink(mContextMenuLinkId); } @@ -362,7 +361,6 @@ public: void UI::WorkflowsTab() { - auto ls = LocaleStrings::Instance.get(); auto& project = *GlobalStates::GetInstance().GetCurrentProject(); static std::unique_ptr openWorkflow; @@ -370,17 +368,17 @@ void UI::WorkflowsTab() bool openedDummy = true; // Toolbar item: close - if (ImGui::Button(ls->Close.Get(), openWorkflow == nullptr)) { + if (ImGui::Button(ICON_FA_TIMES " " I18N_TEXT("Close", L10N_CLOSE), openWorkflow == nullptr)) { openWorkflow = nullptr; } // Toolbar item: open... ImGui::SameLine(); - if (ImGui::Button(ls->OpenAsset.Get())) { - ImGui::OpenPopup(ls->OpenAssetDialogTitle.Get()); + if (ImGui::Button((I18N_TEXT("Open asset...", L10N_ASSET_OPEN)))) { + ImGui::OpenPopup(I18N_TEXT("Open asset", L10N_ASSET_OPEN_DIALOG_TITLE)); } - if (ImGui::BeginPopupModal(ls->OpenAssetDialogTitle.Get(), &openedDummy, ImGuiWindowFlags_AlwaysAutoResize)) { - if (ImGui::Button(ls->Open.Get(), state.SelectedAsset == nullptr)) { + if (ImGui::BeginPopupModal(I18N_TEXT("Open asset", L10N_ASSET_OPEN_DIALOG_TITLE), &openedDummy, ImGuiWindowFlags_AlwaysAutoResize)) { + if (ImGui::Button(I18N_TEXT("Open", L10N_OPEN), state.SelectedAsset == nullptr)) { auto workflow = project.Workflows.Load(*state.SelectedAsset); openWorkflow = std::make_unique(std::move(workflow)); } @@ -393,10 +391,10 @@ void UI::WorkflowsTab() // Toolbar item: manage... ImGui::SameLine(); - if (ImGui::Button(ls->ManageAssets.Get())) { - ImGui::OpenPopup(ls->ManageAssetsDialogTitle.Get()); + if (ImGui::Button(I18N_TEXT("Manage assets...", L10N_ASSET_MANAGE))) { + ImGui::OpenPopup(I18N_TEXT("Manage assets", L10N_ASSET_MANAGE_DIALOG_TITLE)); } - if (ImGui::BeginPopupModal(ls->ManageAssetsDialogTitle.Get(), &openedDummy, ImGuiWindowFlags_AlwaysAutoResize)) { + if (ImGui::BeginPopupModal(I18N_TEXT("Manage assets", L10N_ASSET_MANAGE_DIALOG_TITLE), &openedDummy, ImGuiWindowFlags_AlwaysAutoResize)) { project.Workflows.DisplayControls(state); project.Workflows.DisplayDetailsList(state); ImGui::EndPopup(); -- cgit v1.2.3-70-g09d2