mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-14 03:11:19 +00:00
Merge branch 'main' into extruder-variants-ui-2
This commit is contained in:
@@ -13,13 +13,60 @@
|
||||
#include "Search.hpp"
|
||||
#include "OG_CustomCtrl.hpp"
|
||||
|
||||
#include "libslic3r/Config.hpp"
|
||||
#include <boost/any.hpp>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
||||
#include "slic3r/GUI/Widgets/TextInput.hpp"
|
||||
#include <memory>
|
||||
#include "slic3r/GUI/Field.hpp"
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <initializer_list>
|
||||
#include "slic3r/GUI/GUI.hpp"
|
||||
#include "libslic3r/Preset.hpp"
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <wx/anybutton.h>
|
||||
#include <cstdint>
|
||||
#include <iterator>
|
||||
#include <functional>
|
||||
#include "libslic3r/ParameterUtils.hpp"
|
||||
#include <climits>
|
||||
#include "slic3r/GUI/ObjectDataViewModel.hpp"
|
||||
#include <cstring>
|
||||
#include "slic3r/GUI/Widgets/Button.hpp"
|
||||
#include <boost/algorithm/string/erase.hpp>
|
||||
#include <cmath>
|
||||
#include "libslic3r/enum_bitmask.hpp"
|
||||
#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
|
||||
#include <deque>
|
||||
#include <exception>
|
||||
#include "libslic3r/LifecycleEvents.hpp"
|
||||
#include "libslic3r/Point.hpp"
|
||||
#include "slic3r/GUI/SettingsIndex.hpp"
|
||||
#include "slic3r/GUI/DeviceCore/DevDefs.h"
|
||||
#include <wx/app.h>
|
||||
#include <wx/bookctrl.h>
|
||||
#include <wx/arrstr.h>
|
||||
#include <wx/button.h>
|
||||
#include <wx/event.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/colour.h>
|
||||
#include <wx/dataview.h>
|
||||
#include <wx/dynarray.h>
|
||||
#include <wx/scrolwin.h>
|
||||
#include <wx/sizer.h>
|
||||
|
||||
#include <wx/bmpcbox.h>
|
||||
#include <wx/bmpbuttn.h>
|
||||
#include <wx/timer.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/treebase.h>
|
||||
#include <wx/tglbtn.h>
|
||||
#include <wx/treectrl.h>
|
||||
#include <wx/imaglist.h>
|
||||
#include <wx/settings.h>
|
||||
|
||||
Reference in New Issue
Block a user