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

Set default filament color rgb(242, 117, 78)

Browse source 
Introduce secondary accent color rgb(242, 117, 78)
This commit is contained in:
SoftFever 2023-04-01 22:20:53 +08:00
parent b85b514bd9
commit c7dbf848a6
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/PrintConfig.cpp
View file

@ -1236,14 +1236,14 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Default filament color"); def->tooltip = L("Default filament color");
def->gui_type = ConfigOptionDef::GUIType::color; def->gui_type = ConfigOptionDef::GUIType::color;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionStrings{""}); def->set_default_value(new ConfigOptionStrings{"#F2754E"});
def = this->add("filament_colour", coStrings); def = this->add("filament_colour", coStrings);
def->label = L("Color"); def->label = L("Color");
def->tooltip = L("Only used as a visual help on UI"); def->tooltip = L("Only used as a visual help on UI");
def->gui_type = ConfigOptionDef::GUIType::color; def->gui_type = ConfigOptionDef::GUIType::color;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionStrings{ "#009688" }); def->set_default_value(new ConfigOptionStrings{ "#F2754E" });
//bbs //bbs
def = this->add("required_nozzle_HRC", coInts); def = this->add("required_nozzle_HRC", coInts);

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

@ -1562,7 +1562,7 @@ void PartPlate::generate_plate_name_texture()
auto text = m_name.empty()? _L("Untitled") : m_name; auto text = m_name.empty()? _L("Untitled") : m_name;
wxCoord w, h; wxCoord w, h;
auto* font = &Label::Head_48; 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)) 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"; BOOST_LOG_TRIVIAL(error) << "PartPlate::generate_plate_name_texture(): generate_from_text_string() failed";
auto bed_ext = get_extents(m_shape); auto bed_ext = get_extents(m_shape);
@ -2779,7 +2779,7 @@ void PartPlateList::generate_icon_textures()
else else
file_name = std::to_string(i+1); 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)) { 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; BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(":load file %1% failed") % file_name;
} }

2
src/slic3r/GUI/Widgets/TabCtrl.cpp
View file

@ -302,7 +302,7 @@ void TabCtrl::doRender(wxDC& dc)
#else #else
dc.SetPen(wxPen(border_color.colorForStates(states), border_width)); dc.SetPen(wxPen(border_color.colorForStates(states), border_width));
dc.DrawLine(0, size.y - BS2, size.x, size.y - BS2); 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.SetPen(wxPen(c, 1));
dc.SetBrush(c); dc.SetBrush(c);
dc.DrawRoundedRectangle(x1 - radius, size.y - BS2 - border_width * 3, x2 + radius * 2 - x1, border_width * 3, radius); dc.DrawRoundedRectangle(x1 - radius, size.y - BS2 - border_width * 3, x2 + radius * 2 - x1, border_width * 3, radius);