From 844c374798aa3160d10000e262d98f4e53cd7e1f Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 9 Jul 2026 19:42:21 +0800 Subject: [PATCH] update colors --- resources/images/extruder_badge_both_selected.svg | 8 ++++---- .../images/extruder_badge_both_selected_dark.svg | 8 ++++---- resources/images/extruder_badge_left_selected.svg | 4 ++-- .../images/extruder_badge_left_selected_dark.svg | 4 ++-- .../images/extruder_badge_left_selected_single.svg | 4 ++-- .../extruder_badge_left_selected_single_dark.svg | 4 ++-- resources/images/extruder_badge_right_selected.svg | 4 ++-- .../images/extruder_badge_right_selected_dark.svg | 4 ++-- resources/web/flush/NozzleListTable.html | 6 +++--- src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp | 2 +- .../GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.cpp | 2 +- .../GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp | 2 +- src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp | 2 +- src/slic3r/GUI/Widgets/MultiNozzleSync.cpp | 12 ++++++------ 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/resources/images/extruder_badge_both_selected.svg b/resources/images/extruder_badge_both_selected.svg index 595ca930a5..02c8eca9a6 100644 --- a/resources/images/extruder_badge_both_selected.svg +++ b/resources/images/extruder_badge_both_selected.svg @@ -15,8 +15,8 @@ - - + + @@ -30,8 +30,8 @@ - - + + diff --git a/resources/images/extruder_badge_both_selected_dark.svg b/resources/images/extruder_badge_both_selected_dark.svg index 76049161da..b04cfb27d0 100644 --- a/resources/images/extruder_badge_both_selected_dark.svg +++ b/resources/images/extruder_badge_both_selected_dark.svg @@ -15,8 +15,8 @@ - - + + @@ -30,8 +30,8 @@ - - + + diff --git a/resources/images/extruder_badge_left_selected.svg b/resources/images/extruder_badge_left_selected.svg index 0ca45dd745..a12b164c07 100644 --- a/resources/images/extruder_badge_left_selected.svg +++ b/resources/images/extruder_badge_left_selected.svg @@ -12,8 +12,8 @@ - - + + diff --git a/resources/images/extruder_badge_left_selected_dark.svg b/resources/images/extruder_badge_left_selected_dark.svg index fdd69b311c..afab5c4417 100644 --- a/resources/images/extruder_badge_left_selected_dark.svg +++ b/resources/images/extruder_badge_left_selected_dark.svg @@ -26,8 +26,8 @@ - - + + diff --git a/resources/images/extruder_badge_left_selected_single.svg b/resources/images/extruder_badge_left_selected_single.svg index 694d8771f3..e0cd3299a8 100644 --- a/resources/images/extruder_badge_left_selected_single.svg +++ b/resources/images/extruder_badge_left_selected_single.svg @@ -13,8 +13,8 @@ - - + + diff --git a/resources/images/extruder_badge_left_selected_single_dark.svg b/resources/images/extruder_badge_left_selected_single_dark.svg index 5dc9090544..12ba53d2b7 100644 --- a/resources/images/extruder_badge_left_selected_single_dark.svg +++ b/resources/images/extruder_badge_left_selected_single_dark.svg @@ -28,8 +28,8 @@ - - + + diff --git a/resources/images/extruder_badge_right_selected.svg b/resources/images/extruder_badge_right_selected.svg index f9dcdf2095..d5c4d2aa73 100644 --- a/resources/images/extruder_badge_right_selected.svg +++ b/resources/images/extruder_badge_right_selected.svg @@ -26,8 +26,8 @@ - - + + diff --git a/resources/images/extruder_badge_right_selected_dark.svg b/resources/images/extruder_badge_right_selected_dark.svg index 84393a2d07..cd08bdde9b 100644 --- a/resources/images/extruder_badge_right_selected_dark.svg +++ b/resources/images/extruder_badge_right_selected_dark.svg @@ -15,8 +15,8 @@ - - + + diff --git a/resources/web/flush/NozzleListTable.html b/resources/web/flush/NozzleListTable.html index 6c7cd29c7d..51da2cbd52 100644 --- a/resources/web/flush/NozzleListTable.html +++ b/resources/web/flush/NozzleListTable.html @@ -69,8 +69,8 @@ } input[type="radio"]:checked { - background-color: #00ae42; - border-color: #00ae42; + background-color: #009688; + border-color: #009688; } input[type="radio"]:checked::after { @@ -91,7 +91,7 @@ } .recommended { - color: #28a745; + color: #009688; font-weight: bold; } diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp index e8fbf37d15..da8eda24e0 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp @@ -33,7 +33,7 @@ static const wxColour WGT_GREY200 = wxColour(248, 248, 248); static const wxColour WGT_GREY300 = wxColour(238, 238, 238); -static wxColour s_hgreen_clr("#00AE42"); +static wxColour s_hgreen_clr("#009688"); namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.cpp index 23c69bf6e2..7dde545f99 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.cpp @@ -22,7 +22,7 @@ #define WGT_RACK_NOZZLE_SIZE WX_DIP_SIZE(88, 100) static wxColour s_gray_clr("#B0B0B0"); -static wxColour s_hgreen_clr("#00AE42"); +static wxColour s_hgreen_clr("#009688"); static wxColour s_red_clr("#D01B1B"); wxDEFINE_EVENT(EVT_NOZZLE_RACK_NOZZLE_ITEM_SELECTED, wxCommandEvent); diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp index e992d4b1ab..c88bc7c516 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp @@ -612,7 +612,7 @@ void wgtDeviceNozzleRackHotendUpdate::UpdateInfo(const DevNozzle& nozzle) m_used_time->Show(true); m_status_label->Show(true); m_status_bitmap->Show(true); - m_status_label->SetForegroundColour(wxColour("#00AE42")); + m_status_label->SetForegroundColour(wxColour("#009688")); m_status_label->SetLabel(_L("Refresh")); m_status_bitmap->SetBitmap(m_refresh_icon->bmp()); m_status_bitmap->Refresh(); diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp index 201b762537..dda471ac23 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp @@ -13,7 +13,7 @@ #include "slic3r/GUI/Widgets/Label.hpp" static wxColour s_gray_clr("#B0B0B0"); -static wxColour s_hgreen_clr("#00AE42"); +static wxColour s_hgreen_clr("#009688"); static wxColour s_red_clr("#D01B1B"); static std::vector a_nozzle_seq = {16, 18, 20, 17, 19, 21}; diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp index 9bcf3e234c..cf7e5743b1 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp @@ -455,11 +455,11 @@ std::vector HotEndTable::FilterHotEnds(const NozzleOption& option) void HotEndTable::MarkRelatedItems(const NozzleOption& option) { const static StateColor bg_green( - std::pair(wxColour("#DBFDE7"), StateColor::Normal) + std::pair(wxColour("#E5F0EE"), StateColor::Normal) ); const static StateColor bd_green( - std::pair(wxColour("#00AE42"), StateColor::Normal) + std::pair(wxColour("#009688"), StateColor::Normal) ); auto filtered_nozzles = FilterHotEnds(option); for (auto nozzle_id : filtered_nozzles) { @@ -470,7 +470,7 @@ void HotEndTable::MarkRelatedItems(const NozzleOption& option) item->SetBackgroundColor(bg_green); item->SetBorderColor(bd_green); for (auto child : item->GetChildren()) { - child->SetBackgroundColour("#DBFDE7"); + child->SetBackgroundColour("#E5F0EE"); } } wxGetApp().UpdateDarkUIWin(this); @@ -793,9 +793,9 @@ Slic3r::GUI::MultiNozzleSyncDialog::MultiNozzleSyncDialog(wxWindow* parent,std:: StateColor btn_bg_green( std::pair(wxColour(144, 144, 144), StateColor::Disabled), - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), - std::pair(wxColour(0, 174, 66), StateColor::Normal) + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), + std::pair(wxColour(0, 150, 136), StateColor::Normal) ); StateColor btn_text_green(