From ad79a0541ad6255da569c61164769bff64b31f8c Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 19 May 2023 17:26:41 +0200
Subject: [PATCH] Partially fix for #10568 - Something untranslated
---
src/slic3r/GUI/GUI_ObjectList.cpp | 4 ++--
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp | 8 +++++---
src/slic3r/GUI/Tab.cpp | 3 +--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 88e8f8691..f1356299b 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -1795,7 +1795,7 @@ void ObjectList::load_shape_object(const std::string& type_name)
// Create mesh
BoundingBoxf3 bb;
TriangleMesh mesh = create_mesh(type_name, bb);
- load_mesh_object(mesh, _u8L("Shape") + "-" + type_name);
+ load_mesh_object(mesh, _u8L("Shape") + "-" + into_u8(_(type_name)));
if (!m_objects->empty())
m_objects->back()->volumes.front()->source.is_from_builtin_objects = true;
wxGetApp().mainframe->update_title();
@@ -2064,7 +2064,7 @@ bool ObjectList::del_from_cut_object(bool is_cut_connector, bool is_model_part/*
InfoDialog dialog(wxGetApp().plater(), title,
_L("This action will break a cut information.\n"
"After that PrusaSlicer can't guarantee model consistency.") + "\n\n" +
- _L("To manipulate with solid parts or negative volumes you have to invalidate cut information first." + msg_end ),
+ _L("To manipulate with solid parts or negative volumes you have to invalidate cut information first.") + msg_end,
false, buttons_style | wxCANCEL_DEFAULT | wxICON_WARNING);
dialog.SetButtonLabel(wxID_YES, _L("Invalidate cut info"));
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
index 516a2b258..20203d656 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -71,7 +71,7 @@ static std::vector<std::string> get_extruders_names()
std::vector<std::string> extruders_out;
extruders_out.reserve(extruders_count);
for (size_t extruder_idx = 1; extruder_idx <= extruders_count; ++extruder_idx)
- extruders_out.emplace_back("Extruder " + std::to_string(extruder_idx));
+ extruders_out.emplace_back(_u8L("Extruder") + " " + std::to_string(extruder_idx));
return extruders_out;
}
@@ -334,7 +334,8 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
const ColorRGBA& select_first_color = m_modified_extruders_colors[m_first_selected_extruder_idx];
ImVec4 first_color = ImGuiWrapper::to_ImVec4(select_first_color);
- if (ImGui::ColorEdit4("First color##color_picker", (float*)&first_color, ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel))
+ const std::string first_label = into_u8(m_desc.at("first_color")) + "##color_picker";
+ if (ImGui::ColorEdit4(first_label.c_str(), (float*)&first_color, ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel))
m_modified_extruders_colors[m_first_selected_extruder_idx] = ImGuiWrapper::from_ImVec4(first_color);
ImGui::AlignTextToFramePadding();
@@ -346,7 +347,8 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
const ColorRGBA& select_second_color = m_modified_extruders_colors[m_second_selected_extruder_idx];
ImVec4 second_color = ImGuiWrapper::to_ImVec4(select_second_color);
- if (ImGui::ColorEdit4("Second color##color_picker", (float*)&second_color, ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel))
+ const std::string second_label = into_u8(m_desc.at("second_color")) + "##color_picker";
+ if (ImGui::ColorEdit4(second_label.c_str(), (float*)&second_color, ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel))
m_modified_extruders_colors[m_second_selected_extruder_idx] = ImGuiWrapper::from_ImVec4(second_color);
const float max_tooltip_width = ImGui::GetFontSize() * 20.0f;
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index b8cb3c4c6..6d0c17fc0 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -5154,8 +5154,7 @@ void TabSLAPrint::build()
optgroup->append_single_option_line("support_tree_type");
optgroup->append_single_option_line("support_enforcers_only");
- build_sla_support_params({{"", "Default"}, {"branching", "Branching"}}, page);
-
+ build_sla_support_params({{"", L("Default")}, {"branching", L("Branching")}}, page);
optgroup = page->new_optgroup(L("Automatic generation"));
optgroup->append_single_option_line("support_points_density_relative");