GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 23:15:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'lm_translations' into fs_svg_SPE-1517

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-10-16 11:46:18 +02:00
commit 544c2c30c8
6 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GUI_Factories.cpp
View File

@ -1080,7 +1080,7 @@ void MenuFactory::append_menu_item_edit_svg(wxMenu *menu)
return; return;
} }
wxString description = _L("Ability to change SVG source file, projection, size, ..."); wxString description = _L("Change SVG source file, projection, size, ...");
std::string icon = "cog"; std::string icon = "cog";
auto open_svg = [](const wxCommandEvent &) { auto open_svg = [](const wxCommandEvent &) {
GLGizmosManager &mng = plater()->canvas3D()->get_gizmos_manager(); GLGizmosManager &mng = plater()->canvas3D()->get_gizmos_manager();

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

@ -3671,7 +3671,7 @@ GuiCfg create_gui_configuration()
// TRN - Input label. Be short as possible // TRN - Input label. Be short as possible
// Keep vector from bottom to top of text aligned with printer Y axis // Keep vector from bottom to top of text aligned with printer Y axis
tr.keep_up = _u8L("Keep Up"); tr.keep_up = _u8L("Keep up");
// TRN - Input label. Be short as possible. // TRN - Input label. Be short as possible.
// Some Font file contain multiple fonts inside and // Some Font file contain multiple fonts inside and

57
src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
View File

@ -1131,22 +1131,22 @@ std::vector<std::string> create_shape_warnings(const EmbossShape &shape, float s
size_t shape_index = 0; size_t shape_index = 0;
for (NSVGshape *shape = image.shapes; shape != NULL; shape = shape->next, ++shape_index) { for (NSVGshape *shape = image.shapes; shape != NULL; shape = shape->next, ++shape_index) {
if (!(shape->flags & NSVG_FLAGS_VISIBLE)){ if (!(shape->flags & NSVG_FLAGS_VISIBLE)){
add_warning(shape_index * 2, GUI::format(_L("Shape(%1%) is marked as invisible "), shape->id)); add_warning(shape_index * 2, GUI::format(_L("Shape is marked as invisible (%1%)"), shape->id));
continue; continue;
} }
std::string fill_warning = create_fill_warning(*shape); std::string fill_warning = create_fill_warning(*shape);
if (!fill_warning.empty()) if (!fill_warning.empty())
add_warning(shape_index * 2, GUI::format(_L("Fill of shape(%1%) contain unsupported: %2% "), shape->id, fill_warning)); add_warning(shape_index * 2, GUI::format(_L("Fill of shape (%1%) contains unsupported: %2% "), shape->id, fill_warning));
float minimal_width_in_mm = 1e-3f; float minimal_width_in_mm = 1e-3f;
if (shape->strokeWidth <= minimal_width_in_mm * scale) { if (shape->strokeWidth <= minimal_width_in_mm * scale) {
add_warning(shape_index * 2, GUI::format(_L("Stroke of shape(%1%) is too thin (minimal width is %2% mm)"), shape->id, minimal_width_in_mm)); add_warning(shape_index * 2, GUI::format(_L("Stroke of shape (%1%) is too thin (minimal width is %2% mm)"), shape->id, minimal_width_in_mm));
continue; continue;
} }
std::string stroke_warning = create_stroke_warning(*shape); std::string stroke_warning = create_stroke_warning(*shape);
if (!stroke_warning.empty()) if (!stroke_warning.empty())
add_warning(shape_index * 2 + 1, GUI::format(_L("Stroke of shape(%1%) contain unsupported: %2% "), shape->id, stroke_warning)); add_warning(shape_index * 2 + 1, GUI::format(_L("Stroke of shape (%1%) contains unsupported: %2% "), shape->id, stroke_warning));
} }
return result; return result;
} }
@ -1431,7 +1431,8 @@ void GLGizmoSVG::draw_preview(){
count_of_points += count_points(expoly); count_of_points += count_points(expoly);
} }
} }
std::string tooltip = GUI::format(_L("SVG contain %1% shapes which creates %2% polygons with %3% line segments"), // TRN: All the three placeholders are numbers
std::string tooltip = GUI::format(_L("SVG contains %1% shapes which create %2% polygons with %3% line segments"),
count_of_shapes, count_of_expolygons, count_of_points); count_of_shapes, count_of_expolygons, count_of_points);
ImGui::SetTooltip("%s", tooltip.c_str()); ImGui::SetTooltip("%s", tooltip.c_str());
} }
@ -1485,7 +1486,7 @@ void GLGizmoSVG::draw_filename(){
is_hovered |= ImGui::IsItemHovered(); is_hovered |= ImGui::IsItemHovered();
if (is_hovered) { if (is_hovered) {
std::string tooltip = GUI::format(_L("SVG file path is \"%1%\" "), es.svg_file.path); std::string tooltip = GUI::format(_L("SVG file path is \"%1%\""), es.svg_file.path);
ImGui::SetTooltip("%s", tooltip.c_str()); ImGui::SetTooltip("%s", tooltip.c_str());
} }
@ -1502,7 +1503,7 @@ void GLGizmoSVG::draw_filename(){
file_changed = true; file_changed = true;
} }
} else if (ImGui::IsItemHovered()) } else if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", _u8L("Re-load SVG file from disk.").c_str()); ImGui::SetTooltip("%s", _u8L("Reload SVG file from disk.").c_str());
} }
ImGuiComboFlags flags = ImGuiComboFlags_PopupAlignLeft | ImGuiComboFlags_NoPreview; ImGuiComboFlags flags = ImGuiComboFlags_PopupAlignLeft | ImGuiComboFlags_NoPreview;
@ -1537,7 +1538,7 @@ void GLGizmoSVG::draw_filename(){
m_volume_shape.svg_file.path.clear(); m_volume_shape.svg_file.path.clear();
m_filename_preview.clear(); m_filename_preview.clear();
} else if (ImGui::IsItemHovered()) { } else if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Don't save local path to SVG file.\n Also disable option to reload from disk.").c_str()); ImGui::SetTooltip("%s", _u8L("Do NOT save local path to 3MF file.\n Also disables 'reload from disk' option.").c_str());
} }
} }
@ -1561,11 +1562,13 @@ void GLGizmoSVG::draw_filename(){
draw(get_icon(m_icons, IconType::bake)); draw(get_icon(m_icons, IconType::bake));
ImGui::SameLine(); ImGui::SameLine();
// TRN: An menu option to convert the SVG into an unmodifiable model part.
if (ImGui::Selectable(_u8L("Bake").c_str())) { if (ImGui::Selectable(_u8L("Bake").c_str())) {
m_volume->emboss_shape.reset(); m_volume->emboss_shape.reset();
close(); close();
} else if (ImGui::IsItemHovered()) { } else if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Bake into model uneditable part and protect yours ©opyright of svg").c_str()); // TRN: Tooltip for the menu item.
ImGui::SetTooltip("%s", _u8L("Bake into model as uneditable part").c_str());
} }
draw(get_icon(m_icons, IconType::save)); draw(get_icon(m_icons, IconType::save));
@ -1574,7 +1577,7 @@ void GLGizmoSVG::draw_filename(){
wxWindow *parent = nullptr; wxWindow *parent = nullptr;
GUI::FileType file_type = FT_SVG; GUI::FileType file_type = FT_SVG;
wxString wildcard = file_wildcards(file_type); wxString wildcard = file_wildcards(file_type);
wxString dlg_title = _L("Export SVG file:"); wxString dlg_title = _L("Save SVG file");
const EmbossShape::SvgFile& svg = m_volume_shape.svg_file; const EmbossShape::SvgFile& svg = m_volume_shape.svg_file;
wxString dlg_file = from_u8(get_file_name(((!svg.path.empty()) ? svg.path : svg.path_in_3mf))) + ".svg"; wxString dlg_file = from_u8(get_file_name(((!svg.path.empty()) ? svg.path : svg.path_in_3mf))) + ".svg";
wxFileDialog dlg(parent, dlg_title, last_used_directory, dlg_file, wildcard, wxFD_SAVE | wxFD_OVERWRITE_PROMPT); wxFileDialog dlg(parent, dlg_title, last_used_directory, dlg_file, wildcard, wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
@ -1677,7 +1680,8 @@ void GLGizmoSVG::draw_size()
size_t count_points = 0; size_t count_points = 0;
for (const auto &s : m_volume_shape.shapes_with_ids) for (const auto &s : m_volume_shape.shapes_with_ids)
count_points += Slic3r::count_points(s.expoly); count_points += Slic3r::count_points(s.expoly);
ImGui::SetTooltip("%s", GUI::format(_L("Scale also change amout of curve samples(%1%)"), count_points).c_str()); // TRN: The placeholder contains a number.
ImGui::SetTooltip("%s", GUI::format(_L("Scale also changes amount of curve samples (%1%)"), count_points).c_str());
} }
bool use_inch = wxGetApp().app_config->get_bool("use_inches"); bool use_inch = wxGetApp().app_config->get_bool("use_inches");
@ -1765,10 +1769,7 @@ void GLGizmoSVG::draw_size()
if (button(icon, icon_hover, icon)) if (button(icon, icon_hover, icon))
m_keep_ratio = !m_keep_ratio; m_keep_ratio = !m_keep_ratio;
if (ImGui::IsItemHovered()) if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", (m_keep_ratio ? ImGui::SetTooltip("%s", _u8L("Lock/unlock the aspect ratio of the SVG.").c_str());
_u8L("Free set of width and height value."):
_u8L("Keep same ratio of width to height.")
).c_str());
// reset button // reset button
@ -1777,7 +1778,7 @@ void GLGizmoSVG::draw_size()
if (reset_button(m_icons)) { if (reset_button(m_icons)) {
new_relative_scale = Vec3d(1./m_scale_width.value_or(1.f), 1./m_scale_height.value_or(1.f), 1.); new_relative_scale = Vec3d(1./m_scale_width.value_or(1.f), 1./m_scale_height.value_or(1.f), 1.);
} else if (ImGui::IsItemHovered()) } else if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", _u8L("Reset scale to loaded one from the SVG").c_str()); ImGui::SetTooltip("%s", _u8L("Reset scale").c_str());
} }
if (new_relative_scale.has_value()){ if (new_relative_scale.has_value()){
@ -1836,7 +1837,7 @@ void GLGizmoSVG::draw_distance()
ImGui::SetNextItemWidth(m_gui_cfg->input_width); ImGui::SetNextItemWidth(m_gui_cfg->input_width);
bool use_inch = wxGetApp().app_config->get_bool("use_inches"); bool use_inch = wxGetApp().app_config->get_bool("use_inches");
const wxString move_tooltip = _L("Distance of the center of the text to the model surface."); const wxString move_tooltip = _L("Distance of the center of the SVG to the model surface.");
bool is_moved = false; bool is_moved = false;
if (use_inch) { if (use_inch) {
std::optional<float> distance_inch; std::optional<float> distance_inch;
@ -1862,7 +1863,7 @@ void GLGizmoSVG::draw_distance()
m_distance.reset(); m_distance.reset();
is_moved = true; is_moved = true;
} else if (ImGui::IsItemHovered()) } else if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", _u8L("Reset distance to zero value").c_str()); ImGui::SetTooltip("%s", _u8L("Reset distance").c_str());
} }
if (is_moved) if (is_moved)
@ -1908,7 +1909,7 @@ void GLGizmoSVG::draw_rotation()
if (m_volume->emboss_shape->projection.use_surface) if (m_volume->emboss_shape->projection.use_surface)
process(); process();
} else if (ImGui::IsItemHovered()) } else if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", _u8L("Reset rotation to zero value").c_str()); ImGui::SetTooltip("%s", _u8L("Reset rotation").c_str());
} }
// Keep up - lock button icon // Keep up - lock button icon
@ -1919,10 +1920,7 @@ void GLGizmoSVG::draw_rotation()
if (button(icon, icon_hover, icon)) if (button(icon, icon_hover, icon))
m_keep_up = !m_keep_up; m_keep_up = !m_keep_up;
if (ImGui::IsItemHovered()) if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", (m_keep_up? ImGui::SetTooltip("%s", _u8L("Lock/unlock rotation angle when dragging above the surface.").c_str());
_u8L("Free angle when dragging above the object's surface."):
_u8L("Keep same rotation angle when dragging above the object's surface.")
).c_str());
} }
} }
@ -1934,14 +1932,14 @@ void GLGizmoSVG::draw_mirroring()
if(clickable(get_icon(m_icons, IconType::reflection_x), get_icon(m_icons, IconType::reflection_x_hover))){ if(clickable(get_icon(m_icons, IconType::reflection_x), get_icon(m_icons, IconType::reflection_x_hover))){
axis = Axis::X; axis = Axis::X;
} else if (ImGui::IsItemHovered()) { } else if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Reflect by 2d Y axis").c_str()); ImGui::SetTooltip("%s", _u8L("Mirror vertically").c_str());
} }
ImGui::SameLine(); ImGui::SameLine();
if (clickable(get_icon(m_icons, IconType::reflection_y), get_icon(m_icons, IconType::reflection_y_hover))) { if (clickable(get_icon(m_icons, IconType::reflection_y), get_icon(m_icons, IconType::reflection_y_hover))) {
axis = Axis::Y; axis = Axis::Y;
} else if (ImGui::IsItemHovered()) { } else if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Reflect by 2d X axis").c_str()); ImGui::SetTooltip("%s", _u8L("Mirror horizontally").c_str());
} }
if (axis != Axis::UNKNOWN_AXIS){ if (axis != Axis::UNKNOWN_AXIS){
@ -2011,6 +2009,7 @@ void GLGizmoSVG::draw_model_type()
if (m_volume != nullptr && new_type.has_value() && !is_last_solid_part) { if (m_volume != nullptr && new_type.has_value() && !is_last_solid_part) {
GUI_App &app = wxGetApp(); GUI_App &app = wxGetApp();
Plater * plater = app.plater(); Plater * plater = app.plater();
// TRN: This is the name of the action that shows in undo/redo stack (changing part type from SVG to something else).
Plater::TakeSnapshot snapshot(plater, _L("Change SVG Type"), UndoRedo::SnapshotType::GizmoAction); Plater::TakeSnapshot snapshot(plater, _L("Change SVG Type"), UndoRedo::SnapshotType::GizmoAction);
m_volume->set_type(*new_type); m_volume->set_type(*new_type);
@ -2204,17 +2203,17 @@ EmbossShape select_shape(std::string_view filepath, double tesselation_tolerance
} }
if (!boost::filesystem::exists(shape.svg_file.path)) { if (!boost::filesystem::exists(shape.svg_file.path)) {
show_error(nullptr, GUI::format(_u8L("File(%1%) does NOT exists."), shape.svg_file.path)); show_error(nullptr, GUI::format(_u8L("File does NOT exist (%1%)."), shape.svg_file.path));
return {}; return {};
} }
if (!boost::algorithm::iends_with(shape.svg_file.path, ".svg")){ if (!boost::algorithm::iends_with(shape.svg_file.path, ".svg")){
show_error(nullptr, GUI::format(_u8L("File has to end with \".svg\" but you select: %1%"), shape.svg_file.path)); show_error(nullptr, GUI::format(_u8L("Filename has to end with \".svg\" but you selected %1%"), shape.svg_file.path));
return {}; return {};
} }
if(init_image(shape.svg_file) == nullptr) { if(init_image(shape.svg_file) == nullptr) {
show_error(nullptr, GUI::format(_u8L("Nano SVG parser can't load from file(%1%)."), shape.svg_file.path)); show_error(nullptr, GUI::format(_u8L("Nano SVG parser can't load from file (%1%)."), shape.svg_file.path));
return {}; return {};
} }
@ -2224,7 +2223,7 @@ EmbossShape select_shape(std::string_view filepath, double tesselation_tolerance
// Must contain some shapes !!! // Must contain some shapes !!!
if (shape.shapes_with_ids.empty()) { if (shape.shapes_with_ids.empty()) {
show_error(nullptr, GUI::format(_u8L("SVG file(%1%) do NOT contain path to be able embossed."), shape.svg_file.path)); show_error(nullptr, GUI::format(_u8L("SVG file does NOT contain a single path to be embossed (%1%)."), shape.svg_file.path));
return {}; return {};
} }
return shape; return shape;

3
src/slic3r/GUI/Jobs/EmbossJob.cpp
View File

@ -1030,7 +1030,8 @@ void update_volume(TriangleMesh &&mesh, const DataUpdate &data, const Transform3
assert(plater->canvas3D()->get_gizmos_manager().get_current_type() == GLGizmosManager::Emboss || assert(plater->canvas3D()->get_gizmos_manager().get_current_type() == GLGizmosManager::Emboss ||
plater->canvas3D()->get_gizmos_manager().get_current_type() == GLGizmosManager::Svg); plater->canvas3D()->get_gizmos_manager().get_current_type() == GLGizmosManager::Svg);
std::string snap_name = GUI::format(_L("Change: %1%"), data.base->volume_name); // TRN: This is the name of the action appearing in undo/redo stack.
std::string snap_name = _u8L("Text/SVG attribute change");
Plater::TakeSnapshot snapshot(plater, snap_name, UndoRedo::SnapshotType::GizmoAction); Plater::TakeSnapshot snapshot(plater, snap_name, UndoRedo::SnapshotType::GizmoAction);
ModelVolume *volume = get_model_volume(data.volume_id, plater->model().objects); ModelVolume *volume = get_model_volume(data.volume_id, plater->model().objects);

4
src/slic3r/GUI/MainFrame.cpp
View File

@ -1392,10 +1392,10 @@ void MainFrame::init_menubar_as_editor()
append_submenu(fileMenu, export_menu, wxID_ANY, _L("&Export"), ""); append_submenu(fileMenu, export_menu, wxID_ANY, _L("&Export"), "");
wxMenu* convert_menu = new wxMenu(); wxMenu* convert_menu = new wxMenu();
append_menu_item(convert_menu, wxID_ANY, _L("Convert ascii G-code to &binary") + dots, _L("Convert a G-code file from ascii to binary format"), append_menu_item(convert_menu, wxID_ANY, _L("Convert ASCII G-code to &binary") + dots, _L("Convert a G-code file from ASCII to binary format"),
[this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->convert_gcode_to_binary(); }, "convert_file", nullptr, [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->convert_gcode_to_binary(); }, "convert_file", nullptr,
[]() { return true; }, this); []() { return true; }, this);
append_menu_item(convert_menu, wxID_ANY, _L("Convert binary G-code to &ascii") + dots, _L("Convert a G-code file from binary to ascii format"), append_menu_item(convert_menu, wxID_ANY, _L("Convert binary G-code to &ASCII") + dots, _L("Convert a G-code file from binary to ASCII format"),
[this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->convert_gcode_to_ascii(); }, "convert_file", nullptr, [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->convert_gcode_to_ascii(); }, "convert_file", nullptr,
[]() { return true; }, this); []() { return true; }, this);
append_submenu(fileMenu, convert_menu, wxID_ANY, _L("&Convert"), ""); append_submenu(fileMenu, convert_menu, wxID_ANY, _L("&Convert"), "");

4
src/slic3r/GUI/Plater.cpp
View File

@ -6914,8 +6914,8 @@ void publish(Model &model) {
if (exist_new){ if (exist_new){
MessageDialog dialog(nullptr, MessageDialog dialog(nullptr,
_L("Are you sure you want to store original SVGs with their local path into .3mf ?\n " _L("Are you sure you want to store original SVGs with their local paths into the 3MF file?\n "
"When you hit 'NO', all Embossed shape will not be editable any more."), "If you hit 'NO', all SVGs in the project will not be editable any more."),
_L("Private protection"), wxYES_NO | wxICON_QUESTION); _L("Private protection"), wxYES_NO | wxICON_QUESTION);
if (dialog.ShowModal() == wxID_NO){ if (dialog.ShowModal() == wxID_NO){
for (ModelObject *object : model.objects) for (ModelObject *object : model.objects)