3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 12:11:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed SPE-993

Browse source 
+ Added new icons for layers editing
This commit is contained in:
YuSanka 2019-07-30 15:45:32 +02:00
parent 320f964847
commit 66497cdb1f
5 changed files with 116 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -1293,7 +1293,7 @@ wxMenuItem* ObjectList::append_menu_item_split(wxMenu* menu)
wxMenuItem* ObjectList::append_menu_item_layers_editing(wxMenu* menu)
{
return append_menu_item(menu, wxID_ANY, _(L("Edit Layers")), "",
[this](wxCommandEvent&) { layers_editing(); }, "layers", menu);
[this](wxCommandEvent&) { layers_editing(); }, "edit_layers_all", menu);
}
wxMenuItem* ObjectList::append_menu_item_settings(wxMenu* menu_)

3
src/slic3r/GUI/Tab.cpp
View file

@ -2186,6 +2186,9 @@ void TabPrinter::extruders_count_changed(size_t extruders_count)
m_preset_bundle->update_multi_material_filament_presets();
is_count_changed = true;
}
else if (m_extruders_count == 1 &&
m_preset_bundle->project_config.option<ConfigOptionFloats>("wiping_volumes_matrix")->values.size()>1)
m_preset_bundle->update_multi_material_filament_presets();
/* This function should be call in any case because of correct updating/rebuilding
* of unregular pages of a Printer Settings

4
src/slic3r/GUI/wxExtensions.cpp
View file

@ -450,7 +450,7 @@ ObjectDataViewModelNode::ObjectDataViewModelNode(ObjectDataViewModelNode* parent
}
else if (type == itLayerRoot)
{
m_bmp = create_scaled_bitmap(nullptr, "layers"); // FIXME: pass window ptr
m_bmp = create_scaled_bitmap(nullptr, "edit_layers_all"); // FIXME: pass window ptr
m_name = _(L("Layers"));
}
@ -484,7 +484,7 @@ ObjectDataViewModelNode::ObjectDataViewModelNode(ObjectDataViewModelNode* parent
}
const std::string label_range = (boost::format(" %.2f-%.2f ") % layer_range.first % layer_range.second).str();
m_name = _(L("Range")) + label_range + "(" + _(L("mm")) + ")";
m_bmp = create_scaled_bitmap(nullptr, "layers_white"); // FIXME: pass window ptr
m_bmp = create_scaled_bitmap(nullptr, "edit_layers_some"); // FIXME: pass window ptr
#ifdef __WXGTK__
// it's necessary on GTK because of control have to know if this item will be container