3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_transformations

Browse source
This commit is contained in:
enricoturri1966 2023-02-15 08:57:35 +01:00
commit 9510c4b4fa
55 changed files with 447 additions and 373 deletions

12
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View file

@ -118,8 +118,8 @@ static const wxString axes_color_back[] = { "#f5dcdc", "#dcf5dc", "#dcdcf5" };
ObjectManipulation::ObjectManipulation(wxWindow* parent) :
OG_Settings(parent, true)
{
m_imperial_units = wxGetApp().app_config->get("use_inches") == "1";
m_use_colors = wxGetApp().app_config->get("color_mapinulation_panel") == "1";
m_imperial_units = wxGetApp().app_config->get_bool("use_inches");
m_use_colors = wxGetApp().app_config->get_bool("color_mapinulation_panel");
m_manifold_warning_bmp = ScalableBitmap(parent, "exclamation");
@ -647,8 +647,8 @@ void ObjectManipulation::DisableUnuniformScale()
void ObjectManipulation::update_ui_from_settings()
{
if (m_imperial_units != (wxGetApp().app_config->get("use_inches") == "1")) {
m_imperial_units = wxGetApp().app_config->get("use_inches") == "1";
if (m_imperial_units != wxGetApp().app_config->get_bool("use_inches")) {
m_imperial_units = wxGetApp().app_config->get_bool("use_inches");
auto update_unit_text = [](const wxString& new_unit_text, wxStaticText* widget) {
widget->SetLabel(new_unit_text);
@ -672,8 +672,8 @@ void ObjectManipulation::update_ui_from_settings()
}
m_check_inch->SetValue(m_imperial_units);
if (m_use_colors != (wxGetApp().app_config->get("color_mapinulation_panel") == "1")) {
m_use_colors = wxGetApp().app_config->get("color_mapinulation_panel") == "1";
if (m_use_colors != wxGetApp().app_config->get_bool("color_mapinulation_panel")) {
m_use_colors = wxGetApp().app_config->get_bool("color_mapinulation_panel");
// update colors for edit-boxes
int axis_id = 0;
for (ManipulationEditor* editor : m_editors) {