From 79676fe4cc2264b909b593379f78bf0c3a636e74 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 15 Sep 2023 10:15:52 +0200 Subject: [PATCH 1/2] Added missed includes --- src/libslic3r/GCode/Thumbnails.cpp | 1 + src/libslic3r/PrintConfig.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libslic3r/GCode/Thumbnails.cpp b/src/libslic3r/GCode/Thumbnails.cpp index edafccbea8..6e2b51f764 100644 --- a/src/libslic3r/GCode/Thumbnails.cpp +++ b/src/libslic3r/GCode/Thumbnails.cpp @@ -4,6 +4,7 @@ ///|/ #include "Thumbnails.hpp" #include "../miniz_extension.hpp" +#include "../format.hpp" #include #include diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 23e17e0018..973fd2b397 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -22,6 +22,7 @@ #include "PrintConfig.hpp" #include "Config.hpp" #include "I18N.hpp" +#include "format.hpp" #include "SLA/SupportTree.hpp" #include "GCode/Thumbnails.hpp" From 8e693c5a14ac969c6339f8770289f3ff614a0b5a Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 15 Sep 2023 10:30:04 +0200 Subject: [PATCH 2/2] Updated tooltip for "use_firmware_retraction" parameter (related to PR#11301) + fixed typo in "Edit Custom G-code" tooltip --- src/libslic3r/PrintConfig.cpp | 4 ++-- src/slic3r/GUI/OptionsGroup.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 973fd2b397..e7c05e8db0 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -3176,8 +3176,8 @@ void PrintConfigDef::init_fff_params() def = this->add("use_firmware_retraction", coBool); def->label = L("Use firmware retraction"); - def->tooltip = L("This experimental setting uses G10 and G11 commands to have the firmware " - "handle the retraction. This is only supported in recent Marlin."); + def->tooltip = L("This setting uses G10 and G11 commands to have the firmware " + "handle the retraction. Note that this has to be supported by firmware."); def->mode = comExpert; def->set_default_value(new ConfigOptionBool(false)); diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 1e1d3c08bd..0fa39cd106 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -113,7 +113,7 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co if (!m_disabled) this->edit_custom_gcode(opt_id); }; - field->set_edit_tooltip(_L("Edit CustomG-code")); + field->set_edit_tooltip(_L("Edit Custom G-code")); } field->m_back_to_initial_value = [this](std::string opt_id) {