3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-03-04 09:34:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Update color

Browse source
This commit is contained in:
Noisyfox 2025-10-24 22:34:02 +08:00
parent 7c7d80479d
commit 06fbd3c087
5 changed files with 81 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,7 @@ PartSkipDialog::PartSkipDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _
buf << put_time(std::localtime(&t), "%a_%b_%d_%H_%M_%S/");
m_timestamp = buf.str();
std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % Slic3r::resources_dir()).str();
std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % Slic3r::resources_dir()).str();
SetIcon(wxIcon(Slic3r::encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
SetBackgroundColour(*wxWHITE);
@ -955,7 +955,7 @@ int PartSkipDialog::GetAllSkippedPartsNum()
PartSkipConfirmDialog::PartSkipConfirmDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _L("Skip Objects"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
{
std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % Slic3r::resources_dir()).str();
std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % Slic3r::resources_dir()).str();
SetIcon(wxIcon(Slic3r::encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
SetBackgroundColour(*wxWHITE);
SetMinSize(wxSize(FromDIP(480), FromDIP(215)));

14
src/slic3r/GUI/PrintOptionsDialog.cpp
View file

@ -15,10 +15,10 @@ static const wxColour STATIC_TEXT_EXPLAIN_COL = wxColour(100, 100, 100);
namespace Slic3r { namespace GUI {
static StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(194, 194, 194), StateColor::Disabled),
std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 177, 66), StateColor::Normal));
static StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Disabled),
std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
PrintOptionsDialog::PrintOptionsDialog(wxWindow* parent)
: DPIDialog(parent, wxID_ANY, _L("Print Options"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
@ -1166,11 +1166,10 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
wxSizer* single_update_nozzle_sizer = new wxBoxSizer(wxHORIZONTAL);
m_single_update_nozzle_button = new Button(single_panel, _L("Refresh"));
m_single_update_nozzle_button->SetBackgroundColor(btn_bg_green);
m_single_update_nozzle_button->SetTextColor(*wxWHITE);
m_single_update_nozzle_button->SetTextColor(wxColour("#FFFFFE"));
m_single_update_nozzle_button->SetFont(Label::Body_14);
m_single_update_nozzle_button->SetSize(wxSize(FromDIP(80), FromDIP(32)));
m_single_update_nozzle_button->SetMinSize(wxSize(-1, FromDIP(32)));
m_single_update_nozzle_button->SetCornerRadius(FromDIP(16));
m_single_update_nozzle_button->Bind(wxEVT_BUTTON, &PrinterPartsDialog::OnNozzleRefresh, this);
single_update_nozzle_sizer->Add(0, 0, 1, wxEXPAND, FromDIP(0));
single_update_nozzle_sizer->Add(m_single_update_nozzle_button, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(18));
@ -1282,11 +1281,10 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
wxSizer* multiple_update_nozzle_sizer = new wxBoxSizer(wxHORIZONTAL);
m_multiple_update_nozzle_button = new Button(multiple_panel, _L("Refresh"));
m_multiple_update_nozzle_button->SetBackgroundColor(btn_bg_green);
m_multiple_update_nozzle_button->SetTextColor(*wxWHITE);
m_multiple_update_nozzle_button->SetTextColor(wxColour("#FFFFFE"));
m_multiple_update_nozzle_button->SetFont(Label::Body_14);
m_multiple_update_nozzle_button->SetSize(wxSize(FromDIP(80), FromDIP(32)));
m_multiple_update_nozzle_button->SetMinSize(wxSize(-1, FromDIP(32)));
m_multiple_update_nozzle_button->SetCornerRadius(FromDIP(16));
m_multiple_update_nozzle_button->Bind(wxEVT_BUTTON, &PrinterPartsDialog::OnNozzleRefresh, this);
multiple_update_nozzle_sizer->Add(0, 0, 1, wxEXPAND, FromDIP(0));
multiple_update_nozzle_sizer->Add(m_multiple_update_nozzle_button, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(18));

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

@ -16,10 +16,6 @@ ThermalPreconditioningDialog::ThermalPreconditioningDialog(wxWindow *parent, std
: wxDialog(parent, wxID_ANY, _L("Thermal Preconditioning for first layer optimization"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
, m_dev_id(dev_id)
{
wxBitmap bitmap = create_scaled_bitmap("thermal_preconditioning_title", this, 16);
wxIcon icon;
icon.CopyFromBitmap(bitmap);
SetIcon(icon);
// Apply dark-mode-friendly background for the dialog
SetBackgroundColour(StateColor::darkModeColorFor(wxColour(255, 255, 255)));
create_ui();