GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-22 07:04:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix various config display problems

Browse Source 
- typo
 - missing ironing name
 - sort after translation
This commit is contained in:
supermerill 2020-11-26 19:18:30 +01:00
parent 35111e1698
commit db21177093
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/Config.cpp
View File

@ -30,6 +30,7 @@ std::string toString(OptionCategory opt) {
case perimeter: return "Perimeters & Shell";
case slicing: return "Slicing";
case infill: return "Infill";
case ironing: return "Ironing PP";
case skirtBrim: return "Skirt & Brim";
case support: return "Support material";
case width: return "Width & Flow";

18
src/libslic3r/PrintConfig.cpp
View File

@ -686,7 +686,6 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("rectilinear");
def->enum_values.push_back("rectilineargapfill");
def->enum_values.push_back("monotonic");
def->enum_values.push_back("alignedrectilinear");
def->enum_values.push_back("concentric");
def->enum_values.push_back("concentricgapfill");
def->enum_values.push_back("hilbertcurve");
@ -699,7 +698,6 @@ void PrintConfigDef::init_fff_params()
def->enum_labels.push_back(L("Rectilinear"));
def->enum_labels.push_back(L("Monotonic (filled)"));
def->enum_labels.push_back(L("Monotonic"));
def->enum_labels.push_back(L("Aligned Rectilinear"));
def->enum_labels.push_back(L("Concentric"));
def->enum_labels.push_back(L("Concentric (filled)"));
def->enum_labels.push_back(L("Hilbert Curve"));
@ -1907,11 +1905,11 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionBool(false));
def = this->add("infill_connection", coEnum);
def->label = L("Do not connect infill lines to each other");
def->label = L("Connection of sparse infill lines");
def->category = OptionCategory::infill;
def->tooltip = L("Give to the infill algorithm if the infill needs to be connected, and on which periemters"
" Can be useful for art or with high infill/perimeter overlap."
" The result amy varies between infill typers.");
" The result may varies between infill typers.");
def->enum_keys_map = &ConfigOptionEnum<InfillConnection>::get_enum_values();
def->enum_values.push_back("connected");
def->enum_values.push_back("holes");
@ -1925,11 +1923,11 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionEnum<InfillConnection>(icConnected));
def = this->add("infill_connection_top", coEnum);
def->label = L("Do not connect infill lines to each other");
def->label = L("Connection of top infill lines");
def->category = OptionCategory::infill;
def->tooltip = L("Give to the infill algorithm if the infill needs to be connected, and on which periemters"
" Can be useful for art or with high infill/perimeter overlap."
" The result amy varies between infill typers.");
" The result may varies between infill typers.");
def->enum_keys_map = &ConfigOptionEnum<InfillConnection>::get_enum_values();
def->enum_values.push_back("connected");
def->enum_values.push_back("holes");
@ -1943,11 +1941,11 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionEnum<InfillConnection>(icConnected));
def = this->add("infill_connection_bottom", coEnum);
def->label = L("Do not connect infill lines to each other");
def->label = L("Connection of bottom infill lines");
def->category = OptionCategory::infill;
def->tooltip = L("Give to the infill algorithm if the infill needs to be connected, and on which periemters"
" Can be useful for art or with high infill/perimeter overlap."
" The result amy varies between infill typers.");
" The result may varies between infill typers.");
def->enum_keys_map = &ConfigOptionEnum<InfillConnection>::get_enum_values();
def->enum_values.push_back("connected");
def->enum_values.push_back("holes");
@ -1961,11 +1959,11 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionEnum<InfillConnection>(icConnected));
def = this->add("infill_connection_solid", coEnum);
def->label = L("Do not connect infill lines to each other");
def->label = L("Connection of solid infill lines");
def->category = OptionCategory::infill;
def->tooltip = L("Give to the infill algorithm if the infill needs to be connected, and on which periemters"
" Can be useful for art or with high infill/perimeter overlap."
" The result amy varies between infill typers.");
" The result may varies between infill typers.");
def->enum_keys_map = &ConfigOptionEnum<InfillConnection>::get_enum_values();
def->enum_values.push_back("connected");
def->enum_values.push_back("holes");

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

@ -1380,7 +1380,7 @@ void ObjectList::get_settings_choice(const wxString& category_name)
int sel = 0;
//sort per label, because there isn't a better one.
std::sort(cat2idname.second.begin(), cat2idname.second.end(),
[](const std::pair< std::string, std::string> &e1, const std::pair< std::string, std::string> &e2)->bool {return e1.second<e2.second; });
[](const std::pair< std::string, std::string> &e1, const std::pair< std::string, std::string> &e2)->bool {return _L(e1.second)< _L(e2.second); });
for (auto& pair_strid_strname : cat2idname.second) {
names.Add(_(pair_strid_strname.second));
if (find(opt_keys.begin(), opt_keys.end(), pair_strid_strname.first) != opt_keys.end())
@ -1395,7 +1395,7 @@ void ObjectList::get_settings_choice(const wxString& category_name)
if (!settings_list)
return;
if (wxGetSelectedChoices(selections, _(L("Select showing settings")), category_name, names) == -1)
if (wxGetSelectedChoices(selections, _L("Select showing settings"), category_name, names) == -1)
return;
const int selection_cnt = selections.size();