From 06fbd3c087c2e3aaa632e2bf6180d1225f5ca213 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Fri, 24 Oct 2025 22:34:02 +0800 Subject: [PATCH] Update color --- resources/images/ext_image_n7.svg | 146 +++++++++--------- .../images/thermal_preconditioning_title.svg | 16 -- src/slic3r/GUI/PartSkipDialog.cpp | 4 +- src/slic3r/GUI/PrintOptionsDialog.cpp | 14 +- .../GUI/ThermalPreconditioningDialog.cpp | 4 - 5 files changed, 81 insertions(+), 103 deletions(-) delete mode 100644 resources/images/thermal_preconditioning_title.svg diff --git a/resources/images/ext_image_n7.svg b/resources/images/ext_image_n7.svg index e397e89efe..0e82ba9bcf 100644 --- a/resources/images/ext_image_n7.svg +++ b/resources/images/ext_image_n7.svg @@ -3,13 +3,13 @@ - - + + - - - + + + @@ -29,92 +29,92 @@ - + - - - + + + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - + diff --git a/resources/images/thermal_preconditioning_title.svg b/resources/images/thermal_preconditioning_title.svg deleted file mode 100644 index 1b2d02c981..0000000000 --- a/resources/images/thermal_preconditioning_title.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp index 0956bf9fe1..a88b2eb2fb 100644 --- a/src/slic3r/GUI/PartSkipDialog.cpp +++ b/src/slic3r/GUI/PartSkipDialog.cpp @@ -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))); diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index 6b2e9f694e..02329a36b7 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -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(194, 194, 194), StateColor::Disabled), - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), - std::pair(wxColour(0, 177, 66), StateColor::Normal)); +static StateColor btn_bg_green(std::pair(wxColour(206, 206, 206), StateColor::Disabled), + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), + std::pair(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)); diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp index e73e357956..bd04335a22 100644 --- a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp +++ b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp @@ -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();