diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index f44c0ba..2efa291 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1948,7 +1948,7 @@ void PrintConfigDef::init_fff_params() //B25 def = this->add("enable_volume_fan", coInts); - def->label = L("Volume Fan Speed"); + def->label = L("Chamber Fan Speed"); def->tooltip = L("This setting represents the PWM your volume fan needs to work."); def->sidetext = L("%"); def->min = 0; @@ -2893,9 +2893,9 @@ void PrintConfigDef::init_fff_params() "will create more stable supports, while snug support towers will save material and reduce " "object scarring."); def->set_enum({ - { "grid", L("Grid ") }, - { "snug", L("Snug ") }, - { "organic", L("Organic ") } + { "grid", L("Grid") }, + { "snug", L("Snug") }, + { "organic", L("Organic") } }); def->mode = comAdvanced; def->set_default_value(new ConfigOptionEnum(smsGrid)); diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 5b24f8a..2aabbec 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -1018,7 +1018,7 @@ void Choice::BUILD() { // recast as a wxWindow to fit the calling convention window = dynamic_cast(temp); - +//Y10 /*if (m_opt.enum_def) { if (auto& labels = m_opt.enum_def->labels(); !labels.empty()) { bool localized = m_opt.enum_def->has_labels(); @@ -1026,23 +1026,38 @@ void Choice::BUILD() { temp->Append(localized ? _(from_u8(el)) : from_u8(el)); set_selection(); } - }*/ + }*/ if (m_opt.enum_def) { - // Append localized enum_labels - int i = 0; - boost::filesystem::path image_path(Slic3r::resources_dir()); - image_path /= "icons"; - for (auto el : m_opt.enum_def->labels()) { - auto icon_name = "param_" + m_opt.enum_def->labels()[i]; - if (boost::filesystem::exists(image_path / (icon_name + ".svg"))) { - ScalableBitmap bm(temp, icon_name, 24); - temp->Append(_(el), bm.bmp()); - } else { - temp->Append(_(el)); + if (auto& labels = m_opt.enum_def->labels(); !labels.empty()) + { + bool localized = m_opt.enum_def->has_labels(); + boost::filesystem::path image_path(Slic3r::resources_dir()); + image_path /= "icons"; + for (const std::string& el : labels) + { + std::vector show_pattern_options{ "fill_pattern", "top_fill_pattern", "bottom_fill_pattern", "support_material_pattern","support_material_interface_pattern" }; + bool show_pattern = false; + for (auto sp_option : show_pattern_options) + if (m_opt.opt_key == sp_option) + { + show_pattern = true; + break; + } + if (show_pattern) + { + auto icon_name = "param_" + el; + transform(icon_name.begin(), icon_name.end(), icon_name.begin(), ::tolower); + if (boost::filesystem::exists(image_path / (icon_name + ".svg"))) + { + ScalableBitmap bm(temp, icon_name); + temp->Append(localized ? _(from_u8(el)) : from_u8(el), bm.bmp()); + } + } + else + temp->Append(localized ? _(from_u8(el)) : from_u8(el)); } - ++i; + set_selection(); } - set_selection(); } temp->Bind(wxEVT_MOUSEWHEEL, [this](wxMouseEvent& e) {