3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-02 13:00:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' into dev/bbl-network-upd

Browse source 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
This commit is contained in:
Noisyfox 2025-06-21 10:27:10 +08:00
commit d60fcb0d11
233 changed files with 2205 additions and 1484 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,10 +115,6 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
// font
SetFont(wxGetApp().normal_font());
// icon
std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str();
SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
Freeze();
SetBackgroundColour(m_colour_def_color);