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

ENH: [STUDIO-1528] support list value icons for param field

Browse source 
Change-Id: I44f14fde20fe4d9859c019ead09d1d565af23ba4
This commit is contained in:
chunmao.guo 2022-12-05 09:13:27 +08:00 • committed by Lane.Wei
parent 6a644c271c
commit 4132711f4c
22 changed files with 399 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/slic3r/GUI/Field.cpp
View file

@ -1009,6 +1009,7 @@ void Choice::BUILD() {
temp = new choice_ctrl(m_parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr, wxCB_READONLY);
#endif //__WXOSX__
}
temp->GetDropDown().SetUseContentWidth(true);
if (parent_is_custom_ctrl && m_opt.height < 0)
opt_height = (double) temp->GetTextCtrl()->GetSize().GetHeight() / m_em_unit;
@ -1035,8 +1036,19 @@ void Choice::BUILD() {
temp->Append(el);
} else {
// Append localized enum_labels
for (auto el : m_opt.enum_labels)
temp->Append(_(el));
int i = 0;
boost::filesystem::path image_path(Slic3r::resources_dir());
image_path /= "images";
for (auto el : m_opt.enum_labels) {
auto icon_name = "param_" + m_opt.enum_values[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));
}
++i;
}
}
set_selection();
}
@ -1393,6 +1405,20 @@ void Choice::msw_rescale()
field->SetValue(selection) :
field->SetSelection(idx);
#else
if (!m_opt.enum_labels.empty()) {
boost::filesystem::path image_path(Slic3r::resources_dir());
image_path /= "images";
int i = 0;
auto temp = dynamic_cast<choice_ctrl *>(window);
for (auto el : m_opt.enum_values) {
auto icon_name = "param_" + m_opt.enum_values[i];
if (boost::filesystem::exists(image_path / (icon_name + ".svg"))) {
ScalableBitmap bm(window, icon_name, 24);
temp->SetItemBitmap(i, bm.bmp());
}
++i;
}
}
auto size = wxSize(def_width_wider() * m_em_unit, wxDefaultCoord);
if (m_opt.height >= 0)
size.SetHeight(m_opt.height * m_em_unit);