3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

after rebase changes

Browse Source
This commit is contained in:
David Kocik 2022-09-26 14:54:26 +02:00
parent 41d5c16b76
commit e4313399ea
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -912,7 +912,7 @@ void PlaterPresetComboBox::update()
const AppConfig* app_config = wxGetApp().app_config; const AppConfig* app_config = wxGetApp().app_config;
if (!template_presets.empty() && app_config->get("no_templates") == "0") { if (!template_presets.empty() && app_config->get("no_templates") == "0") {
set_label_marker(Append(separator(L("Template presets")), wxNullBitmap)); set_label_marker(Append(separator(L("Template presets")), wxNullBitmap));
for (std::map<wxString, wxBitmap*>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) { for (std::map<wxString, wxBitmapBundle*>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
Append(it->first, *it->second); Append(it->first, *it->second);
validate_selection(it->first == selected_user_preset); validate_selection(it->first == selected_user_preset);
} }
@ -1100,7 +1100,7 @@ void TabPresetComboBox::update()
if (preset.is_default || preset.is_system) { if (preset.is_default || preset.is_system) {
if (preset.vendor && preset.vendor->templates_profile) { if (preset.vendor && preset.vendor->templates_profile) {
template_presets.emplace(get_preset_name(preset), std::pair<wxBitmap*, bool>(bmp, is_enabled)); template_presets.emplace(get_preset_name(preset), std::pair<wxBitmapBundle*, bool>(bmp, is_enabled));
if (i == idx_selected) if (i == idx_selected)
selected = get_preset_name(preset); selected = get_preset_name(preset);
} else { } else {
@ -1125,7 +1125,7 @@ void TabPresetComboBox::update()
const AppConfig* app_config = wxGetApp().app_config; const AppConfig* app_config = wxGetApp().app_config;
if (!template_presets.empty() && app_config->get("no_templates") == "0") { if (!template_presets.empty() && app_config->get("no_templates") == "0") {
set_label_marker(Append(separator(L("Template presets")), wxNullBitmap)); set_label_marker(Append(separator(L("Template presets")), wxNullBitmap));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmapBundle*, bool>>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
bool is_enabled = it->second.second; bool is_enabled = it->second.second;
if (!is_enabled) if (!is_enabled)

1
src/slic3r/GUI/SavePresetDialog.hpp
View File

@ -87,7 +87,6 @@ private:
public: public:
<<<<<<< master
const wxString& get_info_line_extention() { return m_info_line_extention; } const wxString& get_info_line_extention() { return m_info_line_extention; }
SavePresetDialog(wxWindow* parent, Preset::Type type, std::string suffix = "", bool template_filament = false); SavePresetDialog(wxWindow* parent, Preset::Type type, std::string suffix = "", bool template_filament = false);