3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Moved functions and variables (for fonts and labels color) to GUI_App

Browse source 
+ corrected Sidebar layouts
+ deleted get_preset_bundle
+ actions with tabs_list moved to GUI_App
This commit is contained in:
YuSanka 2018-10-01 15:09:31 +02:00
parent 342b584399
commit 08c6905751
17 changed files with 252 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/AppController.cpp
View file

@ -17,6 +17,7 @@
#include <Geometry.hpp>
#include <Model.hpp>
#include <Utils.hpp>
#include "GUI/GUI_App.hpp"
namespace Slic3r {
@ -41,9 +42,9 @@ bool AppControllerGui::is_main_thread() const
return m_pri_data->ui_thread == std::this_thread::get_id();
}
namespace GUI {
PresetBundle* get_preset_bundle();
}
// namespace GUI {
// PresetBundle* get_preset_bundle();
// }
static const PrintObjectStep STEP_SLICE = posSlice;
static const PrintObjectStep STEP_PERIMETERS = posPerimeters;
@ -142,7 +143,7 @@ void PrintController::slice_to_png()
using Pointf3 = Vec3d;
auto ctl = GUI::get_appctl();
auto presetbundle = GUI::get_preset_bundle();
auto presetbundle = GUI::wxGetApp().preset_bundle;
assert(presetbundle);