From ec6580cdc6fdf4625eb7b991adef914436174501 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 9 Oct 2023 15:39:24 +0200 Subject: [PATCH] Localization: Small fixes for GizmoEmboss and GizmoSVG --- resources/localization/list.txt | 1 + src/slic3r/GUI/GUI_Factories.cpp | 10 +++++----- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 8 ++++---- src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/resources/localization/list.txt b/resources/localization/list.txt index df800c95a6..7b5f924a17 100644 --- a/resources/localization/list.txt +++ b/resources/localization/list.txt @@ -62,6 +62,7 @@ src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp src/slic3r/GUI/Gizmos/GLGizmosManager.cpp src/slic3r/GUI/GLCanvas3D.cpp src/slic3r/GUI/GUI.cpp diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 0a9ff9f4dd..be9f9ae38a 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -177,9 +177,9 @@ static const constexpr std::array, 3> TEXT }}; // Note: id accords to type of the sub-object (adding volume), so sequence of the menu items is important static const constexpr std::array, 3> SVG_VOLUME_ICONS{{ - {L("Add svg part"), "svg_part"}, // ~ModelVolumeType::MODEL_PART - {L("Add negative svg"), "svg_negative"}, // ~ModelVolumeType::NEGATIVE_VOLUME - {L("Add svg modifier"), "svg_modifier"}, // ~ModelVolumeType::PARAMETER_MODIFIER + {L("Add SVG part"), "svg_part"}, // ~ModelVolumeType::MODEL_PART + {L("Add negative SVG"), "svg_negative"}, // ~ModelVolumeType::NEGATIVE_VOLUME + {L("Add SVG modifier"), "svg_modifier"}, // ~ModelVolumeType::PARAMETER_MODIFIER }}; static Plater* plater() @@ -566,7 +566,7 @@ void MenuFactory::append_menu_item_add_text(wxMenu* menu, ModelVolumeType type, } void MenuFactory::append_menu_item_add_svg(wxMenu *menu, ModelVolumeType type, bool is_submenu_item /* = true*/){ - append_menu_itemm_add_(_L("Svg"), GLGizmosManager::Svg, menu, type, is_submenu_item); + append_menu_itemm_add_(_L("SVG"), GLGizmosManager::Svg, menu, type, is_submenu_item); } void MenuFactory::append_menu_items_add_volume(MenuType menu_type) @@ -1056,7 +1056,7 @@ void MenuFactory::append_menu_item_edit_text(wxMenu *menu) void MenuFactory::append_menu_item_edit_svg(wxMenu *menu) { - wxString name = _L("Edit svg"); + wxString name = _L("Edit SVG"); auto can_edit_svg = []() { if (plater() == nullptr) return false; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index b2106f5f54..df6be28678 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -3533,9 +3533,9 @@ void draw_font_preview(FaceName &face, const std::string& text, Facenames &faces // Not finished preview if (is_visible) { // when not canceled still loading - state_text = (face.cancel->load())? - _u8L(" No symbol"): - _u8L(" ... Loading"); + state_text = (face.cancel->load()) ? + " " + _u8L("No symbol"): + " ... " + _u8L("Loading"); } else { // not finished and not visible cancel job face.is_created = nullptr; @@ -3585,7 +3585,7 @@ void draw_font_preview(FaceName &face, const std::string& text, Facenames &faces queue_job(worker, std::move(job)); } else { // cant start new thread at this moment so wait in queue - state_text = _u8L(" ... In queue"); + state_text = " ... " + _u8L("In queue"); } if (!state_text.empty()) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp index d6b1ae18f2..59fb13cbac 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp @@ -1649,7 +1649,7 @@ void GLGizmoSVG::draw_size() } } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Width of SVG."); + ImGui::SetTooltip("%s", _u8L("Width of SVG.").c_str()); ImGui::SameLine(second_offset); ImGui::SetNextItemWidth(input_width); @@ -1662,7 +1662,7 @@ void GLGizmoSVG::draw_size() } } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Height of SVG."); + ImGui::SetTooltip("%s", _u8L("Height of SVG.").c_str()); } // Lock on ratio m_keep_ratio