mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-01 04:02:02 +08:00
Localization: Updated POT. Community dictionaries are merged with new POT.
+ Fixed some phrases + Added some comments for translators
This commit is contained in:
parent
163f81f1d4
commit
e34e267b8c
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,26 @@
|
|||||||
|
src/libslic3r/ExtrusionRole.cpp
|
||||||
|
src/libslic3r/Flow.cpp
|
||||||
|
src/libslic3r/Format/3mf.cpp
|
||||||
|
src/libslic3r/Format/AMF.cpp
|
||||||
|
src/libslic3r/Format/SLAArchiveReader.cpp
|
||||||
|
src/libslic3r/GCode/PostProcessor.cpp
|
||||||
|
src/libslic3r/GCode.cpp
|
||||||
|
src/libslic3r/miniz_extension.cpp
|
||||||
|
src/libslic3r/Preset.cpp
|
||||||
|
src/libslic3r/Print.cpp
|
||||||
|
src/libslic3r/PrintBase.cpp
|
||||||
|
src/libslic3r/PrintConfig.cpp
|
||||||
|
src/libslic3r/PrintObject.cpp
|
||||||
|
src/libslic3r/PrintObjectSlice.cpp
|
||||||
|
src/libslic3r/SLA/Hollowing.cpp
|
||||||
|
src/libslic3r/SLA/Pad.cpp
|
||||||
|
src/libslic3r/SLAPrint.cpp
|
||||||
|
src/libslic3r/SLAPrintSteps.cpp
|
||||||
|
src/libslic3r/Utils.cpp
|
||||||
|
src/libslic3r/Zipper.cpp
|
||||||
|
src/slic3r/Config/Snapshot.cpp
|
||||||
src/slic3r/GUI/AboutDialog.cpp
|
src/slic3r/GUI/AboutDialog.cpp
|
||||||
|
src/slic3r/GUI/ArrangeSettingsDialogImgui.cpp
|
||||||
src/slic3r/GUI/BackgroundSlicingProcess.cpp
|
src/slic3r/GUI/BackgroundSlicingProcess.cpp
|
||||||
src/slic3r/GUI/BedShapeDialog.cpp
|
src/slic3r/GUI/BedShapeDialog.cpp
|
||||||
src/slic3r/GUI/BedShapeDialog.hpp
|
src/slic3r/GUI/BedShapeDialog.hpp
|
||||||
@ -18,7 +40,6 @@ src/slic3r/GUI/FileArchiveDialog.cpp
|
|||||||
src/slic3r/GUI/FirmwareDialog.cpp
|
src/slic3r/GUI/FirmwareDialog.cpp
|
||||||
src/slic3r/GUI/GalleryDialog.cpp
|
src/slic3r/GUI/GalleryDialog.cpp
|
||||||
src/slic3r/GUI/GCodeViewer.cpp
|
src/slic3r/GUI/GCodeViewer.cpp
|
||||||
src/slic3r/GUI/GLCanvas3D.cpp
|
|
||||||
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
|
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
|
||||||
src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
|
src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
|
||||||
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
|
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
|
||||||
@ -37,14 +58,15 @@ src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
|
|||||||
src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
|
src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
|
||||||
src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
|
src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
|
||||||
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
|
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
|
||||||
|
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/GLGizmosManager.cpp
|
src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
|
||||||
src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
|
src/slic3r/GUI/GLCanvas3D.cpp
|
||||||
src/slic3r/GUI/GUI.cpp
|
src/slic3r/GUI/GUI.cpp
|
||||||
src/slic3r/GUI/GUI_App.cpp
|
src/slic3r/GUI/GUI_App.cpp
|
||||||
src/slic3r/GUI/GUI_Init.cpp
|
|
||||||
src/slic3r/GUI/GUI_Factories.cpp
|
src/slic3r/GUI/GUI_Factories.cpp
|
||||||
|
src/slic3r/GUI/GUI_Init.cpp
|
||||||
src/slic3r/GUI/GUI_ObjectLayers.cpp
|
src/slic3r/GUI/GUI_ObjectLayers.cpp
|
||||||
src/slic3r/GUI/GUI_ObjectList.cpp
|
src/slic3r/GUI/GUI_ObjectList.cpp
|
||||||
src/slic3r/GUI/GUI_ObjectManipulation.cpp
|
src/slic3r/GUI/GUI_ObjectManipulation.cpp
|
||||||
@ -53,10 +75,13 @@ src/slic3r/GUI/GUI_Preview.cpp
|
|||||||
src/slic3r/GUI/HintNotification.cpp
|
src/slic3r/GUI/HintNotification.cpp
|
||||||
src/slic3r/GUI/ImGuiWrapper.cpp
|
src/slic3r/GUI/ImGuiWrapper.cpp
|
||||||
src/slic3r/GUI/Jobs/ArrangeJob.cpp
|
src/slic3r/GUI/Jobs/ArrangeJob.cpp
|
||||||
src/slic3r/GUI/Jobs/FillBedJob.cpp
|
src/slic3r/GUI/Jobs/ArrangeJob2.cpp
|
||||||
src/slic3r/GUI/Jobs/EmbossJob.cpp
|
src/slic3r/GUI/Jobs/EmbossJob.cpp
|
||||||
|
src/slic3r/GUI/Jobs/FillBedJob.cpp
|
||||||
|
src/slic3r/GUI/Jobs/PlaterWorker.hpp
|
||||||
src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
|
src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
|
||||||
src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
|
src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
|
||||||
|
src/slic3r/GUI/Jobs/SLAImportDialog.hpp
|
||||||
src/slic3r/GUI/Jobs/SLAImportJob.cpp
|
src/slic3r/GUI/Jobs/SLAImportJob.cpp
|
||||||
src/slic3r/GUI/KBShortcutsDialog.cpp
|
src/slic3r/GUI/KBShortcutsDialog.cpp
|
||||||
src/slic3r/GUI/MainFrame.cpp
|
src/slic3r/GUI/MainFrame.cpp
|
||||||
@ -79,6 +104,7 @@ src/slic3r/GUI/SavePresetDialog.cpp
|
|||||||
src/slic3r/GUI/Search.cpp
|
src/slic3r/GUI/Search.cpp
|
||||||
src/slic3r/GUI/Selection.cpp
|
src/slic3r/GUI/Selection.cpp
|
||||||
src/slic3r/GUI/SendSystemInfoDialog.cpp
|
src/slic3r/GUI/SendSystemInfoDialog.cpp
|
||||||
|
src/slic3r/GUI/SurfaceDrag.cpp
|
||||||
src/slic3r/GUI/SysInfoDialog.cpp
|
src/slic3r/GUI/SysInfoDialog.cpp
|
||||||
src/slic3r/GUI/Tab.cpp
|
src/slic3r/GUI/Tab.cpp
|
||||||
src/slic3r/GUI/Tab.hpp
|
src/slic3r/GUI/Tab.hpp
|
||||||
@ -86,34 +112,15 @@ src/slic3r/GUI/UnsavedChangesDialog.cpp
|
|||||||
src/slic3r/GUI/UpdateDialogs.cpp
|
src/slic3r/GUI/UpdateDialogs.cpp
|
||||||
src/slic3r/GUI/WipeTowerDialog.cpp
|
src/slic3r/GUI/WipeTowerDialog.cpp
|
||||||
src/slic3r/GUI/wxExtensions.cpp
|
src/slic3r/GUI/wxExtensions.cpp
|
||||||
src/slic3r/Utils/AstroBox.cpp
|
|
||||||
src/slic3r/Utils/AppUpdater.cpp
|
src/slic3r/Utils/AppUpdater.cpp
|
||||||
|
src/slic3r/Utils/AstroBox.cpp
|
||||||
src/slic3r/Utils/Duet.cpp
|
src/slic3r/Utils/Duet.cpp
|
||||||
src/slic3r/Utils/FixModelByWin10.cpp
|
src/slic3r/Utils/FixModelByWin10.cpp
|
||||||
src/slic3r/Utils/FlashAir.cpp
|
src/slic3r/Utils/FlashAir.cpp
|
||||||
|
src/slic3r/Utils/Http.cpp
|
||||||
|
src/slic3r/Utils/MKS.cpp
|
||||||
|
src/slic3r/Utils/Moonraker.cpp
|
||||||
src/slic3r/Utils/OctoPrint.cpp
|
src/slic3r/Utils/OctoPrint.cpp
|
||||||
src/slic3r/Utils/PresetUpdater.cpp
|
src/slic3r/Utils/PresetUpdater.cpp
|
||||||
src/slic3r/Utils/Http.cpp
|
|
||||||
src/slic3r/Utils/Process.cpp
|
src/slic3r/Utils/Process.cpp
|
||||||
src/slic3r/Utils/Repetier.cpp
|
src/slic3r/Utils/Repetier.cpp
|
||||||
src/slic3r/Config/Snapshot.cpp
|
|
||||||
src/libslic3r/GCode.cpp
|
|
||||||
src/libslic3r/ExtrusionRole.cpp
|
|
||||||
src/libslic3r/Flow.cpp
|
|
||||||
src/libslic3r/Format/3mf.cpp
|
|
||||||
src/libslic3r/Format/AMF.cpp
|
|
||||||
src/libslic3r/Format/SLAArchiveReader.cpp
|
|
||||||
src/libslic3r/GCode/PostProcessor.cpp
|
|
||||||
src/libslic3r/miniz_extension.cpp
|
|
||||||
src/libslic3r/Preset.cpp
|
|
||||||
src/libslic3r/Print.cpp
|
|
||||||
src/libslic3r/SLA/Pad.cpp
|
|
||||||
src/libslic3r/SLA/Hollowing.cpp
|
|
||||||
src/libslic3r/SLAPrint.cpp
|
|
||||||
src/libslic3r/SLAPrintSteps.cpp
|
|
||||||
src/libslic3r/Utils.cpp
|
|
||||||
src/libslic3r/PrintBase.cpp
|
|
||||||
src/libslic3r/PrintConfig.cpp
|
|
||||||
src/libslic3r/Zipper.cpp
|
|
||||||
src/libslic3r/PrintObject.cpp
|
|
||||||
src/libslic3r/PrintObjectSlice.cpp
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -92,8 +92,14 @@ void ArrangeSettingsDialogImgui::render(float pos_x, float pos_y)
|
|||||||
settings.xl_align));
|
settings.xl_align));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TRN ArrangeDialog
|
||||||
if (m_imgui->combo(_L("Geometry handling"),
|
if (m_imgui->combo(_L("Geometry handling"),
|
||||||
{_u8L("Fast"), _u8L("Balanced"), _u8L("Full complexity")},
|
// TRN ArrangeDialog: Type of "Geometry handling"
|
||||||
|
{_u8L("Fast"),
|
||||||
|
// TRN ArrangeDialog: Type of "Geometry handling"
|
||||||
|
_u8L("Balanced"),
|
||||||
|
// TRN ArrangeDialog: Type of "Geometry handling"
|
||||||
|
_u8L("Accurate")},
|
||||||
settings.geom_handling)) {
|
settings.geom_handling)) {
|
||||||
if (settings.geom_handling >= 0 &&
|
if (settings.geom_handling >= 0 &&
|
||||||
settings.geom_handling < ArrangeSettingsView::ghCount)
|
settings.geom_handling < ArrangeSettingsView::ghCount)
|
||||||
|
@ -161,7 +161,7 @@ GLGizmoBase::GLGizmoBase(GLCanvas3D& parent, const std::string& icon_filename, u
|
|||||||
|
|
||||||
std::string GLGizmoBase::get_action_snapshot_name() const
|
std::string GLGizmoBase::get_action_snapshot_name() const
|
||||||
{
|
{
|
||||||
return _u8L("Gizmo action");
|
return "Gizmo action";
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLGizmoBase::set_hover_id(int id)
|
void GLGizmoBase::set_hover_id(int id)
|
||||||
|
@ -194,7 +194,8 @@ GLGizmoCut3D::GLGizmoCut3D(GLCanvas3D& parent, const std::string& icon_filename,
|
|||||||
|
|
||||||
std::map<const wchar_t, std::string> connetor_types = {
|
std::map<const wchar_t, std::string> connetor_types = {
|
||||||
{ImGui::PlugMarker , _u8L("Plug") },
|
{ImGui::PlugMarker , _u8L("Plug") },
|
||||||
{ImGui::DowelMarker, _u8L("Dowel") },
|
{ImGui::DowelMarker, _u8L("Dowel") },
|
||||||
|
//TRN Connectors type next to "Plug" and "Dowel"
|
||||||
{ImGui::SnapMarker, _u8L("Snap") },
|
{ImGui::SnapMarker, _u8L("Snap") },
|
||||||
};
|
};
|
||||||
for (auto connector : connetor_types) {
|
for (auto connector : connetor_types) {
|
||||||
@ -2679,7 +2680,7 @@ void GLGizmoCut3D::render_cut_plane_input_window(CutConnectors &connectors)
|
|||||||
ImGuiWrapper::text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, m_labels_map["Groove"] + ": ");
|
ImGuiWrapper::text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, m_labels_map["Groove"] + ": ");
|
||||||
render_groove_float_input(m_labels_map["Depth"], m_groove.depth, m_groove.depth_init, m_groove.depth_tolerance);
|
render_groove_float_input(m_labels_map["Depth"], m_groove.depth, m_groove.depth_init, m_groove.depth_tolerance);
|
||||||
render_groove_float_input(m_labels_map["Width"], m_groove.width, m_groove.width_init, m_groove.width_tolerance);
|
render_groove_float_input(m_labels_map["Width"], m_groove.width, m_groove.width_init, m_groove.width_tolerance);
|
||||||
render_groove_angle_input(m_labels_map["Flaps Angle"], m_groove.flaps_angle, m_groove.flaps_angle_init, 30.f, 120.f);
|
render_groove_angle_input(m_labels_map["Flap Angle"], m_groove.flaps_angle, m_groove.flaps_angle_init, 30.f, 120.f);
|
||||||
render_groove_angle_input(m_labels_map["Groove Angle"], m_groove.angle, m_groove.angle_init, 0.f, 15.f);
|
render_groove_angle_input(m_labels_map["Groove Angle"], m_groove.angle, m_groove.angle_init, 0.f, 15.f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
#include "slic3r/GUI/Plater.hpp"
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
#include "slic3r/GUI/MsgDialog.hpp"
|
#include "slic3r/GUI/MsgDialog.hpp"
|
||||||
#include "slic3r/GUI/format.hpp"
|
#include "slic3r/GUI/format.hpp"
|
||||||
|
#include "slic3r/GUI/I18N.hpp"
|
||||||
#include "slic3r/GUI/CameraUtils.hpp"
|
#include "slic3r/GUI/CameraUtils.hpp"
|
||||||
#include "slic3r/GUI/Jobs/EmbossJob.hpp"
|
#include "slic3r/GUI/Jobs/EmbossJob.hpp"
|
||||||
#include "slic3r/GUI/Jobs/CreateFontNameImageJob.hpp"
|
#include "slic3r/GUI/Jobs/CreateFontNameImageJob.hpp"
|
||||||
@ -2631,7 +2632,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("Styles");
|
std::string title = _u8L("Style");
|
||||||
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
|
||||||
@ -3187,7 +3188,7 @@ void GLGizmoEmboss::draw_advanced()
|
|||||||
if (per_glyph) {
|
if (per_glyph) {
|
||||||
ImGui::SetTooltip("%s", _u8L("Set global orientation for whole text.").c_str());
|
ImGui::SetTooltip("%s", _u8L("Set global orientation for whole text.").c_str());
|
||||||
} else {
|
} else {
|
||||||
ImGui::SetTooltip("%s", _u8L("Set position and orientation per Glyph.").c_str());
|
ImGui::SetTooltip("%s", _u8L("Set position and orientation per glyph.").c_str());
|
||||||
if (!m_text_lines.is_init())
|
if (!m_text_lines.is_init())
|
||||||
reinit_text_lines();
|
reinit_text_lines();
|
||||||
}
|
}
|
||||||
@ -3200,28 +3201,28 @@ void GLGizmoEmboss::draw_advanced()
|
|||||||
ImGui::SameLine(gui_cfg->advanced_input_offset);
|
ImGui::SameLine(gui_cfg->advanced_input_offset);
|
||||||
if (align.first==FontProp::HorizontalAlign::left) draw(get_icon(icons, IconType::align_horizontal_left, IconState::hovered));
|
if (align.first==FontProp::HorizontalAlign::left) draw(get_icon(icons, IconType::align_horizontal_left, IconState::hovered));
|
||||||
else if (draw_button(icons, IconType::align_horizontal_left)) { align.first=FontProp::HorizontalAlign::left; is_change = true; }
|
else if (draw_button(icons, IconType::align_horizontal_left)) { align.first=FontProp::HorizontalAlign::left; is_change = true; }
|
||||||
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Set left alignment").c_str());
|
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _CTX_utf8(L_CONTEXT("Left", "Alignment"), "Alignment").c_str());
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (align.first==FontProp::HorizontalAlign::center) draw(get_icon(icons, IconType::align_horizontal_center, IconState::hovered));
|
if (align.first==FontProp::HorizontalAlign::center) draw(get_icon(icons, IconType::align_horizontal_center, IconState::hovered));
|
||||||
else if (draw_button(icons, IconType::align_horizontal_center)) { align.first=FontProp::HorizontalAlign::center; is_change = true; }
|
else if (draw_button(icons, IconType::align_horizontal_center)) { align.first=FontProp::HorizontalAlign::center; is_change = true; }
|
||||||
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Set horizont center alignment").c_str());
|
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _CTX_utf8(L_CONTEXT("Center", "Alignment"), "Alignment").c_str());
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (align.first==FontProp::HorizontalAlign::right) draw(get_icon(icons, IconType::align_horizontal_right, IconState::hovered));
|
if (align.first==FontProp::HorizontalAlign::right) draw(get_icon(icons, IconType::align_horizontal_right, IconState::hovered));
|
||||||
else if (draw_button(icons, IconType::align_horizontal_right)) { align.first=FontProp::HorizontalAlign::right; is_change = true; }
|
else if (draw_button(icons, IconType::align_horizontal_right)) { align.first=FontProp::HorizontalAlign::right; is_change = true; }
|
||||||
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Set right alignment").c_str());
|
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _CTX_utf8(L_CONTEXT("Right", "Alignment"), "Alignment").c_str());
|
||||||
|
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (align.second==FontProp::VerticalAlign::top) draw(get_icon(icons, IconType::align_vertical_top, IconState::hovered));
|
if (align.second==FontProp::VerticalAlign::top) draw(get_icon(icons, IconType::align_vertical_top, IconState::hovered));
|
||||||
else if (draw_button(icons, IconType::align_vertical_top)) { align.second=FontProp::VerticalAlign::top; is_change = true; }
|
else if (draw_button(icons, IconType::align_vertical_top)) { align.second=FontProp::VerticalAlign::top; is_change = true; }
|
||||||
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Set top alignment").c_str());
|
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _CTX_utf8(L_CONTEXT("Top", "Alignment"), "Alignment").c_str());
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (align.second==FontProp::VerticalAlign::center) draw(get_icon(icons, IconType::align_vertical_center, IconState::hovered));
|
if (align.second==FontProp::VerticalAlign::center) draw(get_icon(icons, IconType::align_vertical_center, IconState::hovered));
|
||||||
else if (draw_button(icons, IconType::align_vertical_center)) { align.second=FontProp::VerticalAlign::center; is_change = true; }
|
else if (draw_button(icons, IconType::align_vertical_center)) { align.second=FontProp::VerticalAlign::center; is_change = true; }
|
||||||
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Set vertical center alignment").c_str());
|
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _CTX_utf8(L_CONTEXT("Middle", "Alignment"), "Alignment").c_str());
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (align.second==FontProp::VerticalAlign::bottom) draw(get_icon(icons, IconType::align_vertical_bottom, IconState::hovered));
|
if (align.second==FontProp::VerticalAlign::bottom) draw(get_icon(icons, IconType::align_vertical_bottom, IconState::hovered));
|
||||||
else if (draw_button(icons, IconType::align_vertical_bottom)) { align.second=FontProp::VerticalAlign::bottom; is_change = true; }
|
else if (draw_button(icons, IconType::align_vertical_bottom)) { align.second=FontProp::VerticalAlign::bottom; is_change = true; }
|
||||||
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Set bottom alignment").c_str());
|
else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _CTX_utf8(L_CONTEXT("Bottom", "Alignment"), "Alignment").c_str());
|
||||||
return is_change;
|
return is_change;
|
||||||
};
|
};
|
||||||
const FontProp::Align * def_align = stored_style ? &stored_style->prop.align : nullptr;
|
const FontProp::Align * def_align = stored_style ? &stored_style->prop.align : nullptr;
|
||||||
|
@ -82,7 +82,7 @@ class PlaterWorker: public Worker {
|
|||||||
if (eptr) try {
|
if (eptr) try {
|
||||||
std::rethrow_exception(eptr);
|
std::rethrow_exception(eptr);
|
||||||
} catch (std::exception &e) {
|
} catch (std::exception &e) {
|
||||||
show_error(m_plater, _L("An unexpected error occured: ") + e.what());
|
show_error(m_plater, _L("An unexpected error occured") + ": " + e.what());
|
||||||
eptr = nullptr;
|
eptr = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,7 +89,7 @@ public:
|
|||||||
auto szfilepck = new wxBoxSizer{wxHORIZONTAL};
|
auto szfilepck = new wxBoxSizer{wxHORIZONTAL};
|
||||||
|
|
||||||
m_filepicker = new wxFilePickerCtrl(this, wxID_ANY,
|
m_filepicker = new wxFilePickerCtrl(this, wxID_ANY,
|
||||||
from_u8(wxGetApp().app_config->get_last_dir()), _(L("Choose SLA archive:")),
|
from_u8(wxGetApp().app_config->get_last_dir()), _L("Choose SLA archive") + ":",
|
||||||
get_readers_wildcard(),
|
get_readers_wildcard(),
|
||||||
wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE | wxFD_OPEN | wxFD_FILE_MUST_EXIST);
|
wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE | wxFD_OPEN | wxFD_FILE_MUST_EXIST);
|
||||||
|
|
||||||
@ -114,9 +114,9 @@ public:
|
|||||||
szchoices->Add(new wxStaticText(this, wxID_ANY, _L("Quality") + ": "), 0, wxALIGN_CENTER | wxALL, 5);
|
szchoices->Add(new wxStaticText(this, wxID_ANY, _L("Quality") + ": "), 0, wxALIGN_CENTER | wxALL, 5);
|
||||||
|
|
||||||
static const std::vector<wxString> qual_choices = {
|
static const std::vector<wxString> qual_choices = {
|
||||||
_(L("Accurate")),
|
_L("Accurate"),
|
||||||
_(L("Balanced")),
|
_L("Balanced"),
|
||||||
_(L("Quick"))
|
_L("Fast")
|
||||||
};
|
};
|
||||||
|
|
||||||
m_quality_dropdown = new wxComboBox(
|
m_quality_dropdown = new wxComboBox(
|
||||||
|
@ -33,7 +33,7 @@ bool on_mouse_surface_drag(const wxMouseEvent &mouse_event,
|
|||||||
// Fix when click right button
|
// Fix when click right button
|
||||||
if (surface_drag.has_value() && !mouse_event.Dragging()) {
|
if (surface_drag.has_value() && !mouse_event.Dragging()) {
|
||||||
// write transformation from UI into model
|
// write transformation from UI into model
|
||||||
canvas.do_move(L("Surface move"));
|
canvas.do_move(L("Move over surface"));
|
||||||
|
|
||||||
// allow moving with object again
|
// allow moving with object again
|
||||||
canvas.enable_moving(true);
|
canvas.enable_moving(true);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user