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

Merge branch 'fs_svg_SPE-1517' of https://github.com/Prusa-Development/PrusaSlicerPrivate into fs_svg_SPE-1517

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-10-11 15:01:40 +02:00
commit 155a4f1271
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/localization/list.txt
View File

@ -62,6 +62,7 @@ src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp
src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
src/slic3r/GUI/Gizmos/GLGizmosManager.cpp src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
src/slic3r/GUI/GLCanvas3D.cpp src/slic3r/GUI/GLCanvas3D.cpp
src/slic3r/GUI/GUI.cpp src/slic3r/GUI/GUI.cpp

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

@ -177,9 +177,9 @@ static const constexpr std::array<std::pair<const char *, const char *>, 3> TEXT
}}; }};
// Note: id accords to type of the sub-object (adding volume), so sequence of the menu items is important // Note: id accords to type of the sub-object (adding volume), so sequence of the menu items is important
static const constexpr std::array<std::pair<const char *, const char *>, 3> SVG_VOLUME_ICONS{{ static const constexpr std::array<std::pair<const char *, const char *>, 3> SVG_VOLUME_ICONS{{
{L("Add svg part"), "svg_part"}, // ~ModelVolumeType::MODEL_PART {L("Add SVG part"), "svg_part"}, // ~ModelVolumeType::MODEL_PART
{L("Add negative svg"), "svg_negative"}, // ~ModelVolumeType::NEGATIVE_VOLUME {L("Add negative SVG"), "svg_negative"}, // ~ModelVolumeType::NEGATIVE_VOLUME
{L("Add svg modifier"), "svg_modifier"}, // ~ModelVolumeType::PARAMETER_MODIFIER {L("Add SVG modifier"), "svg_modifier"}, // ~ModelVolumeType::PARAMETER_MODIFIER
}}; }};
static Plater* plater() 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*/){ 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) 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) void MenuFactory::append_menu_item_edit_svg(wxMenu *menu)
{ {
wxString name = _L("Edit svg"); wxString name = _L("Edit SVG");
auto can_edit_svg = []() { auto can_edit_svg = []() {
if (plater() == nullptr) if (plater() == nullptr)
return false; return false;

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

@ -3533,9 +3533,9 @@ void draw_font_preview(FaceName &face, const std::string& text, Facenames &faces
// Not finished preview // Not finished preview
if (is_visible) { if (is_visible) {
// when not canceled still loading // when not canceled still loading
state_text = (face.cancel->load())? state_text = (face.cancel->load()) ?
_u8L(" No symbol"): " " + _u8L("No symbol"):
_u8L(" ... Loading"); " ... " + _u8L("Loading");
} else { } else {
// not finished and not visible cancel job // not finished and not visible cancel job
face.is_created = nullptr; 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)); queue_job(worker, std::move(job));
} else { } else {
// cant start new thread at this moment so wait in queue // 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()) { if (!state_text.empty()) {

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

@ -1649,7 +1649,7 @@ void GLGizmoSVG::draw_size()
} }
} }
if (ImGui::IsItemHovered()) if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", "Width of SVG."); ImGui::SetTooltip("%s", _u8L("Width of SVG.").c_str());
ImGui::SameLine(second_offset); ImGui::SameLine(second_offset);
ImGui::SetNextItemWidth(input_width); ImGui::SetNextItemWidth(input_width);
@ -1662,7 +1662,7 @@ void GLGizmoSVG::draw_size()
} }
} }
if (ImGui::IsItemHovered()) if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", "Height of SVG."); ImGui::SetTooltip("%s", _u8L("Height of SVG.").c_str());
} }
// Lock on ratio m_keep_ratio // Lock on ratio m_keep_ratio