diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 8a06bbe0a4..7f8abc1b14 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1236,14 +1236,14 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Default filament color"); def->gui_type = ConfigOptionDef::GUIType::color; def->mode = comAdvanced; - def->set_default_value(new ConfigOptionStrings{""}); + def->set_default_value(new ConfigOptionStrings{"#F2754E"}); def = this->add("filament_colour", coStrings); def->label = L("Color"); def->tooltip = L("Only used as a visual help on UI"); def->gui_type = ConfigOptionDef::GUIType::color; def->mode = comAdvanced; - def->set_default_value(new ConfigOptionStrings{ "#009688" }); + def->set_default_value(new ConfigOptionStrings{ "#F2754E" }); //bbs def = this->add("required_nozzle_HRC", coInts); diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index da331e37e1..382d9ffef3 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -1562,7 +1562,7 @@ void PartPlate::generate_plate_name_texture() auto text = m_name.empty()? _L("Untitled") : m_name; wxCoord w, h; auto* font = &Label::Head_48; - wxColour foreground(0x0, 0x96, 0x88, 0xff); + wxColour foreground(0xf2, 0x75, 0x4e, 0xff); if (!m_name_texture.generate_from_text_string(text.ToStdString(), *font, *wxBLACK, foreground)) BOOST_LOG_TRIVIAL(error) << "PartPlate::generate_plate_name_texture(): generate_from_text_string() failed"; auto bed_ext = get_extents(m_shape); @@ -2779,7 +2779,7 @@ void PartPlateList::generate_icon_textures() else file_name = std::to_string(i+1); - wxColour foreground(0x0, 0x96, 0x88, 0xff); + wxColour foreground(0xf2, 0x75, 0x4e, 0xff); if (!m_idx_textures[i].generate_from_text_string(file_name, *font, *wxBLACK, foreground)) { BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(":load file %1% failed") % file_name; } diff --git a/src/slic3r/GUI/Widgets/TabCtrl.cpp b/src/slic3r/GUI/Widgets/TabCtrl.cpp index 8928a24afb..4600014ba3 100644 --- a/src/slic3r/GUI/Widgets/TabCtrl.cpp +++ b/src/slic3r/GUI/Widgets/TabCtrl.cpp @@ -302,7 +302,7 @@ void TabCtrl::doRender(wxDC& dc) #else dc.SetPen(wxPen(border_color.colorForStates(states), border_width)); dc.DrawLine(0, size.y - BS2, size.x, size.y - BS2); - wxColor c(0x968800); + wxColour c(0xf2, 0x75, 0x4e, 0xff); dc.SetPen(wxPen(c, 1)); dc.SetBrush(c); dc.DrawRoundedRectangle(x1 - radius, size.y - BS2 - border_width * 3, x2 + radius * 2 - x1, border_width * 3, radius);