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

DiffPresetDialog: Separate Template presets to the own group

Browse Source
This commit is contained in:
YuSanka 2024-03-04 09:11:15 +01:00 committed by Lukas Matena
parent 2b837d9f6e
commit aa6c37adbe
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/slic3r/GUI/PresetComboBoxes.cpp
View File

@ -253,7 +253,6 @@ static wxString get_preset_name_with_suffix(const Preset & preset)
return from_u8(preset.name + Preset::suffix_modified()); return from_u8(preset.name + Preset::suffix_modified());
} }
// ysToDo : Add separator for "Templates" presets
void PresetComboBox::update(std::string select_preset_name) void PresetComboBox::update(std::string select_preset_name)
{ {
Freeze(); Freeze();
@ -273,6 +272,9 @@ void PresetComboBox::update(std::string select_preset_name)
std::vector<PresetData> system_presets; std::vector<PresetData> system_presets;
std::vector<PresetData> nonsys_presets; std::vector<PresetData> nonsys_presets;
std::vector<PresetData> incomp_presets; std::vector<PresetData> incomp_presets;
std::vector<PresetData> template_presets;
const bool allow_templates = !wxGetApp().app_config->get_bool("no_templates");
wxString selected = ""; wxString selected = "";
if (!presets.front().is_visible) if (!presets.front().is_visible)
@ -309,13 +311,24 @@ void PresetComboBox::update(std::string select_preset_name)
} }
else if (preset.is_default || preset.is_system) else if (preset.is_default || preset.is_system)
{ {
system_presets.push_back({get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled}); if (preset.vendor && preset.vendor->templates_profile) {
if (allow_templates)
template_presets.push_back({ get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled });
}
else {
system_presets.push_back({ get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled });
}
if (preset.name == select_preset_name) if (preset.name == select_preset_name)
selected = preset.name; selected = preset.name;
if (preset.is_dirty && m_show_modif_preset_separately) { if (preset.is_dirty && m_show_modif_preset_separately) {
wxString preset_name = get_preset_name_with_suffix(preset); wxString preset_name = get_preset_name_with_suffix(preset);
system_presets.push_back({preset_name, preset_name.Lower(), bmp, is_enabled}); if (preset.vendor && preset.vendor->templates_profile) {
if (allow_templates)
template_presets.push_back({ get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled });
}
else
system_presets.push_back({preset_name, preset_name.Lower(), bmp, is_enabled});
if (into_u8(preset_name) == select_preset_name) if (into_u8(preset_name) == select_preset_name)
selected = preset_name; selected = preset_name;
} }
@ -363,6 +376,22 @@ void PresetComboBox::update(std::string select_preset_name)
validate_selection(it->name == selected); validate_selection(it->name == selected);
} }
} }
if (!template_presets.empty())
{
std::sort(template_presets.begin(), template_presets.end(), [](const PresetData& a, const PresetData& b) {
return a.lower_name < b.lower_name;
});
set_label_marker(Append(separator(L("Template presets")), wxNullBitmap));
for (std::vector<PresetData>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
int item_id = Append(it->name, *it->bitmap);
if (!it->enabled)
set_label_marker(item_id, LABEL_ITEM_DISABLED);
validate_selection(it->name == selected);
}
}
if (!incomp_presets.empty()) if (!incomp_presets.empty())
{ {
std::sort(incomp_presets.begin(), incomp_presets.end(), [](const PresetData& a, const PresetData& b) { std::sort(incomp_presets.begin(), incomp_presets.end(), [](const PresetData& a, const PresetData& b) {