3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EmbossGizmo: Fixed some phrases to improve localization

Browse Source
This commit is contained in:
YuSanka 2023-03-31 14:31:22 +02:00
parent 4cf8d671cb
commit 41026d47b6
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -22,6 +22,7 @@
#include "libslic3r/NSVGUtils.hpp" #include "libslic3r/NSVGUtils.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "libslic3r/Preset.hpp"
#include "libslic3r/ClipperUtils.hpp" // union_ex #include "libslic3r/ClipperUtils.hpp" // union_ex
#include "libslic3r/AppConfig.hpp" // store/load font list #include "libslic3r/AppConfig.hpp" // store/load font list
#include "libslic3r/Format/OBJ.hpp" // load obj file for default object #include "libslic3r/Format/OBJ.hpp" // load obj file for default object
@ -1326,7 +1327,7 @@ void GLGizmoEmboss::draw_text_input()
// show warning about incorrectness view of font // show warning about incorrectness view of font
std::string warning_tool_tip; std::string warning_tool_tip;
if (!exist_font) { if (!exist_font) {
warning_tool_tip = _u8L("Can't write text by selected font.Try to choose another font."); warning_tool_tip = _u8L("The text cannot be written using the selected font. Please try choosing a different font.");
} else { } else {
auto append_warning = [&warning_tool_tip](std::string t) { auto append_warning = [&warning_tool_tip](std::string t) {
if (!warning_tool_tip.empty()) if (!warning_tool_tip.empty())
@ -1335,15 +1336,15 @@ void GLGizmoEmboss::draw_text_input()
}; };
if (priv::is_text_empty(m_text)) if (priv::is_text_empty(m_text))
append_warning(_u8L("Embossed text can NOT contain only white spaces.")); append_warning(_u8L("Embossed text cannot contain only white spaces."));
if (m_text_contain_unknown_glyph) if (m_text_contain_unknown_glyph)
append_warning(_u8L("Text contain character glyph (represented by '?') unknown by font.")); append_warning(_u8L("Text contains character glyph (represented by '?') unknown by font."));
const FontProp &prop = m_style_manager.get_font_prop(); const FontProp &prop = m_style_manager.get_font_prop();
if (prop.skew.has_value()) append_warning(_u8L("Text input do not show font skew.")); if (prop.skew.has_value()) append_warning(_u8L("Text input doesn't show font skew."));
if (prop.boldness.has_value()) append_warning(_u8L("Text input do not show font boldness.")); if (prop.boldness.has_value()) append_warning(_u8L("Text input doesn't show font boldness."));
if (prop.line_gap.has_value()) if (prop.line_gap.has_value())
append_warning(_u8L("Text input do not show gap between lines.")); append_warning(_u8L("Text input doesn't show gap between lines."));
auto &ff = m_style_manager.get_font_file_with_cache(); auto &ff = m_style_manager.get_font_file_with_cache();
float imgui_size = StyleManager::get_imgui_font_size(prop, *ff.font_file, scale); float imgui_size = StyleManager::get_imgui_font_size(prop, *ff.font_file, scale);
if (imgui_size > StyleManager::max_imgui_font_size) if (imgui_size > StyleManager::max_imgui_font_size)
@ -1959,7 +1960,7 @@ void GLGizmoEmboss::draw_font_list()
void GLGizmoEmboss::draw_model_type() void GLGizmoEmboss::draw_model_type()
{ {
bool is_last_solid_part = m_volume->is_the_only_one_part(); bool is_last_solid_part = m_volume->is_the_only_one_part();
std::string title = _u8L("Text is to object"); std::string title = _u8L("Operation");
if (is_last_solid_part) { if (is_last_solid_part) {
ImVec4 color{.5f, .5f, .5f, 1.f}; ImVec4 color{.5f, .5f, .5f, 1.f};
m_imgui->text_colored(color, title.c_str()); m_imgui->text_colored(color, title.c_str());
@ -1973,14 +1974,15 @@ void GLGizmoEmboss::draw_model_type()
ModelVolumeType part = ModelVolumeType::MODEL_PART; ModelVolumeType part = ModelVolumeType::MODEL_PART;
ModelVolumeType type = m_volume->type(); ModelVolumeType type = m_volume->type();
if (ImGui::RadioButton(_u8L("Added").c_str(), type == part)) //TRN EmbossOperation
if (ImGui::RadioButton(_u8L("Join").c_str(), type == part))
new_type = part; new_type = part;
else if (ImGui::IsItemHovered()) else if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", _u8L("Click to change text into object part.").c_str()); ImGui::SetTooltip("%s", _u8L("Click to change text into object part.").c_str());
ImGui::SameLine(); ImGui::SameLine();
std::string last_solid_part_hint = _u8L("You can't change a type of the last solid part of the object."); std::string last_solid_part_hint = _u8L("You can't change a type of the last solid part of the object.");
if (ImGui::RadioButton(_u8L("Subtracted").c_str(), type == negative)) if (ImGui::RadioButton(_CTX_utf8(L_CONTEXT("Cut", "EmbossOperation"), "EmbossOperation").c_str(), type == negative))
new_type = negative; new_type = negative;
else if (ImGui::IsItemHovered()) { else if (ImGui::IsItemHovered()) {
if (is_last_solid_part) if (is_last_solid_part)
@ -2187,7 +2189,7 @@ void GLGizmoEmboss::draw_style_add_button()
}else if (only_add_style) { }else if (only_add_style) {
ImGui::SetTooltip("%s", _u8L("Add style to my list.").c_str()); ImGui::SetTooltip("%s", _u8L("Add style to my list.").c_str());
} else { } else {
ImGui::SetTooltip("%s", _u8L("Add as new named style.").c_str()); ImGui::SetTooltip("%s", _u8L("Save as new style.").c_str());
} }
} }
@ -2300,7 +2302,7 @@ void GLGizmoEmboss::draw_style_list() {
trunc_name = ImGuiWrapper::trunc(current_name, max_style_name_width); trunc_name = ImGuiWrapper::trunc(current_name, max_style_name_width);
} }
std::string title = _u8L("Presets"); std::string title = _u8L("Styles");
if (m_style_manager.exist_stored_style()) if (m_style_manager.exist_stored_style())
ImGui::Text("%s", title.c_str()); ImGui::Text("%s", title.c_str());
else else
@ -2309,7 +2311,7 @@ void GLGizmoEmboss::draw_style_list() {
ImGui::SetNextItemWidth(m_gui_cfg->input_width); ImGui::SetNextItemWidth(m_gui_cfg->input_width);
auto add_text_modify = [&is_modified](const std::string& name) { auto add_text_modify = [&is_modified](const std::string& name) {
if (!is_modified) return name; if (!is_modified) return name;
return name + " (" + _u8L("modified") + ")"; return name + Preset::suffix_modified();
}; };
std::optional<size_t> selected_style_index; std::optional<size_t> selected_style_index;
if (ImGui::BeginCombo("##style_selector", add_text_modify(trunc_name).c_str())) { if (ImGui::BeginCombo("##style_selector", add_text_modify(trunc_name).c_str())) {
@ -2842,17 +2844,17 @@ void GLGizmoEmboss::draw_advanced()
} }
m_imgui->disabled_end(); // !can_use_surface m_imgui->disabled_end(); // !can_use_surface
// TRN EmbossGizmo: font units // TRN EmbossGizmo: font units
std::string units = _u8L("font points"); std::string units = _u8L("points");
std::string units_fmt = "%.0f " + units; std::string units_fmt = "%.0f " + units;
// input gap between letters // input gap between characters
auto def_char_gap = stored_style ? auto def_char_gap = stored_style ?
&stored_style->prop.char_gap : nullptr; &stored_style->prop.char_gap : nullptr;
int half_ascent = font_info.ascent / 2; int half_ascent = font_info.ascent / 2;
int min_char_gap = -half_ascent, max_char_gap = half_ascent; int min_char_gap = -half_ascent, max_char_gap = half_ascent;
if (rev_slider(tr.char_gap, font_prop.char_gap, def_char_gap, _u8L("Revert gap between letters"), if (rev_slider(tr.char_gap, font_prop.char_gap, def_char_gap, _u8L("Revert gap between characters"),
min_char_gap, max_char_gap, units_fmt, _L("Distance between letters"))){ min_char_gap, max_char_gap, units_fmt, _L("Distance between characters"))){
// Condition prevent recalculation when insertint out of limits value by imgui input // Condition prevent recalculation when insertint out of limits value by imgui input
if (!priv::Limits::apply(font_prop.char_gap, priv::limits.char_gap) || if (!priv::Limits::apply(font_prop.char_gap, priv::limits.char_gap) ||
!m_volume->text_configuration->style.prop.char_gap.has_value() || !m_volume->text_configuration->style.prop.char_gap.has_value() ||
@ -2914,7 +2916,7 @@ void GLGizmoEmboss::draw_advanced()
m_imgui->disabled_begin(!allowe_surface_distance); m_imgui->disabled_begin(!allowe_surface_distance);
const std::string undo_move_tooltip = _u8L("Undo translation"); const std::string undo_move_tooltip = _u8L("Undo translation");
const wxString move_tooltip = _L("Distance of the center of text from model surface"); const wxString move_tooltip = _L("Distance of the center of the text to the model surface.");
bool is_moved = false; bool is_moved = false;
bool use_inch = wxGetApp().app_config->get_bool("use_inches"); bool use_inch = wxGetApp().app_config->get_bool("use_inches");
if (use_inch) { if (use_inch) {