diff --git a/resources/images/advanced_option3.svg b/resources/images/advanced_option3.svg index 055fe1ed02..d60800be11 100644 --- a/resources/images/advanced_option3.svg +++ b/resources/images/advanced_option3.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/advanced_option4.svg b/resources/images/advanced_option4.svg index ac831d06fb..c4bf14ed8f 100644 --- a/resources/images/advanced_option4.svg +++ b/resources/images/advanced_option4.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/badge.svg b/resources/images/badge.svg index 9d7180a8e9..3d91a5f0a3 100644 --- a/resources/images/badge.svg +++ b/resources/images/badge.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/images/capsule_tag_on.svg b/resources/images/capsule_tag_on.svg index 39726becbc..0762f664d8 100644 --- a/resources/images/capsule_tag_on.svg +++ b/resources/images/capsule_tag_on.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/images/ext_image_default.svg b/resources/images/ext_image_default.svg index 299f4cb943..33382903a7 100644 --- a/resources/images/ext_image_default.svg +++ b/resources/images/ext_image_default.svg @@ -1,5 +1,5 @@ - - + + diff --git a/resources/images/ext_image_n1.svg b/resources/images/ext_image_n1.svg index 9ab20d8e11..d797d4eecc 100644 --- a/resources/images/ext_image_n1.svg +++ b/resources/images/ext_image_n1.svg @@ -6,11 +6,11 @@ - - - - - + + + + + @@ -107,10 +107,10 @@ - - - - + + + + @@ -129,10 +129,10 @@ - - - - + + + + @@ -312,21 +312,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -461,9 +461,9 @@ - - - + + + @@ -537,14 +537,14 @@ - - - - - - - - + + + + + + + + @@ -557,20 +557,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -705,18 +705,18 @@ - - + + - - + + - - - + + + @@ -727,9 +727,9 @@ - - - + + + diff --git a/resources/images/ext_image_n2s.svg b/resources/images/ext_image_n2s.svg index eca8ee07b1..72e096a50c 100644 --- a/resources/images/ext_image_n2s.svg +++ b/resources/images/ext_image_n2s.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -29,14 +29,14 @@ - + - - - - + + + + - + diff --git a/resources/images/ext_image_o1s.svg b/resources/images/ext_image_o1s.svg index 220d89fc53..3cadd15c6c 100644 --- a/resources/images/ext_image_o1s.svg +++ b/resources/images/ext_image_o1s.svg @@ -3,15 +3,15 @@ - + - - + + - - - + + + @@ -26,8 +26,8 @@ - - + + @@ -60,11 +60,11 @@ - + - - + + @@ -73,45 +73,45 @@ - + - - - + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -122,47 +122,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -189,8 +189,8 @@ - - + + @@ -198,7 +198,7 @@ - + @@ -206,40 +206,40 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + diff --git a/resources/images/ext_image_o_left.svg b/resources/images/ext_image_o_left.svg index 9912aaa6dc..21679e0b98 100644 --- a/resources/images/ext_image_o_left.svg +++ b/resources/images/ext_image_o_left.svg @@ -1,5 +1,5 @@ - + @@ -8,17 +8,17 @@ - - - + + + - - + + @@ -39,13 +39,13 @@ - + - - + + - + @@ -76,22 +76,22 @@ - - + + - + - + - + - - - + + + @@ -108,46 +108,46 @@ - - - - + + + + - + - - - - + + + + - + - - + + - - - + + + - + - - - - + + + + @@ -162,21 +162,21 @@ - + - - + + - - - - - - - + + + + + + + @@ -196,53 +196,53 @@ - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + @@ -254,14 +254,14 @@ - + - + - + @@ -312,18 +312,18 @@ - - - - - + + + + + - - - - - + + + + + @@ -338,23 +338,23 @@ - - + + - + - + - - - - + + + + diff --git a/resources/images/ext_image_o_right.svg b/resources/images/ext_image_o_right.svg index 4b7fa88ff6..8db0c603ed 100644 --- a/resources/images/ext_image_o_right.svg +++ b/resources/images/ext_image_o_right.svg @@ -4,19 +4,19 @@ - + - - + + - - - + + + @@ -33,8 +33,8 @@ - - + + @@ -74,7 +74,7 @@ - + @@ -92,8 +92,8 @@ - - + + @@ -102,7 +102,7 @@ - + @@ -120,52 +120,52 @@ - - - + + + - - + + - - - + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + @@ -186,34 +186,34 @@ - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - + + + @@ -221,20 +221,20 @@ - - - - - - + + + + + + - - + + @@ -242,24 +242,24 @@ - - - - - - - - - - - + + + + + + + + + + + - + - + @@ -287,8 +287,8 @@ - - + + @@ -296,7 +296,7 @@ - + @@ -304,49 +304,49 @@ - - - - - - - + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + @@ -357,5 +357,5 @@ - + diff --git a/resources/images/ext_image_xp.svg b/resources/images/ext_image_xp.svg index c81f8fcb20..d8f1511209 100644 --- a/resources/images/ext_image_xp.svg +++ b/resources/images/ext_image_xp.svg @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -49,10 +49,10 @@ - - + + - + @@ -78,7 +78,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -168,17 +168,17 @@ - - - - - - - + + + + + + + - + @@ -189,7 +189,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -219,8 +219,8 @@ - - + + @@ -287,21 +287,21 @@ - - - - - + + + + + - - + + - + @@ -309,14 +309,14 @@ - - - - - + + + + + - - + + diff --git a/resources/images/fan_poppingup_refresh.svg b/resources/images/fan_poppingup_refresh.svg index 3df14dff05..9070ba255c 100644 --- a/resources/images/fan_poppingup_refresh.svg +++ b/resources/images/fan_poppingup_refresh.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/filament_green.svg b/resources/images/filament_green.svg index 1a417fbb9f..e2886b144c 100644 --- a/resources/images/filament_green.svg +++ b/resources/images/filament_green.svg @@ -1,7 +1,7 @@ - + diff --git a/resources/images/filament_load_expand.svg b/resources/images/filament_load_expand.svg index b00a112512..577d44713d 100644 --- a/resources/images/filament_load_expand.svg +++ b/resources/images/filament_load_expand.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/filament_load_fold.svg b/resources/images/filament_load_fold.svg index e463267470..dd0dabea41 100644 --- a/resources/images/filament_load_fold.svg +++ b/resources/images/filament_load_fold.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/left_extruder_active_filled.svg b/resources/images/left_extruder_active_filled.svg index 887ed13590..86bcf9cd43 100644 --- a/resources/images/left_extruder_active_filled.svg +++ b/resources/images/left_extruder_active_filled.svg @@ -12,5 +12,5 @@ - + diff --git a/resources/images/left_nozzle.svg b/resources/images/left_nozzle.svg index e59b05124c..a8244c5814 100644 --- a/resources/images/left_nozzle.svg +++ b/resources/images/left_nozzle.svg @@ -12,5 +12,5 @@ - + diff --git a/resources/images/map_mode_off_hovered.svg b/resources/images/map_mode_off_hovered.svg index 78e2beb067..b6c91da629 100644 --- a/resources/images/map_mode_off_hovered.svg +++ b/resources/images/map_mode_off_hovered.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/map_mode_on.svg b/resources/images/map_mode_on.svg index df1c78b776..5cfe72ee8e 100644 --- a/resources/images/map_mode_on.svg +++ b/resources/images/map_mode_on.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/images/map_mode_on_hovered.svg b/resources/images/map_mode_on_hovered.svg index eb5bf9cd1e..339ad29ebc 100644 --- a/resources/images/map_mode_on_hovered.svg +++ b/resources/images/map_mode_on_hovered.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/images/outlined_rect.svg b/resources/images/outlined_rect.svg index d9288b4396..487840095a 100644 --- a/resources/images/outlined_rect.svg +++ b/resources/images/outlined_rect.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/pipe_of_empty.svg b/resources/images/pipe_of_empty.svg index 1e8b2324c6..d266c9f8c7 100644 --- a/resources/images/pipe_of_empty.svg +++ b/resources/images/pipe_of_empty.svg @@ -4,16 +4,16 @@ - + - - + + - - + + diff --git a/resources/images/pipe_of_filled.svg b/resources/images/pipe_of_filled.svg index 631d0e7dca..ac8afd1cf9 100644 --- a/resources/images/pipe_of_filled.svg +++ b/resources/images/pipe_of_filled.svg @@ -4,16 +4,16 @@ - - + + - - + + - - + + diff --git a/resources/images/pipe_of_loading_selected.svg b/resources/images/pipe_of_loading_selected.svg index bbc95c2f61..a0a79607aa 100644 --- a/resources/images/pipe_of_loading_selected.svg +++ b/resources/images/pipe_of_loading_selected.svg @@ -2,21 +2,21 @@ - - - + + + - - + + - - + + - - + + diff --git a/resources/images/pipe_of_unloading_selected.svg b/resources/images/pipe_of_unloading_selected.svg index bd19107467..aeb91b0962 100644 --- a/resources/images/pipe_of_unloading_selected.svg +++ b/resources/images/pipe_of_unloading_selected.svg @@ -2,21 +2,21 @@ - - - + + + - - + + - - + + - - + + diff --git a/resources/images/print_options_bg.svg b/resources/images/print_options_bg.svg index f3bfcbd02c..2339f7a907 100644 --- a/resources/images/print_options_bg.svg +++ b/resources/images/print_options_bg.svg @@ -5,7 +5,7 @@ - + diff --git a/resources/images/printer_sync.svg b/resources/images/printer_sync.svg index 1517f8a763..449ab9a97d 100644 --- a/resources/images/printer_sync.svg +++ b/resources/images/printer_sync.svg @@ -1,6 +1,6 @@ - + diff --git a/resources/images/refresh_printer.svg b/resources/images/refresh_printer.svg index e2e123893f..c377397055 100644 --- a/resources/images/refresh_printer.svg +++ b/resources/images/refresh_printer.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/right_extruder_active_filled.svg b/resources/images/right_extruder_active_filled.svg index b160ee80dc..69cf6cf8a8 100644 --- a/resources/images/right_extruder_active_filled.svg +++ b/resources/images/right_extruder_active_filled.svg @@ -12,5 +12,5 @@ - + diff --git a/resources/images/right_nozzle.svg b/resources/images/right_nozzle.svg index 5fb901f9e9..032f4a6f7d 100644 --- a/resources/images/right_nozzle.svg +++ b/resources/images/right_nozzle.svg @@ -12,5 +12,5 @@ - + diff --git a/resources/images/single_nozzle_n.svg b/resources/images/single_nozzle_n.svg index bca4c92c8f..97d1246ae0 100644 --- a/resources/images/single_nozzle_n.svg +++ b/resources/images/single_nozzle_n.svg @@ -6,7 +6,7 @@ - + diff --git a/resources/images/switch_filament_maps.svg b/resources/images/switch_filament_maps.svg index 39205d5154..2c9872a9d6 100644 --- a/resources/images/switch_filament_maps.svg +++ b/resources/images/switch_filament_maps.svg @@ -1,5 +1,5 @@ - - + + diff --git a/resources/images/switch_send_mode_on.svg b/resources/images/switch_send_mode_on.svg index b535b25372..c9f64667f0 100644 --- a/resources/images/switch_send_mode_on.svg +++ b/resources/images/switch_send_mode_on.svg @@ -1,4 +1,4 @@ - - + + diff --git a/resources/images/switch_send_mode_tag_on.svg b/resources/images/switch_send_mode_tag_on.svg index 39726becbc..0762f664d8 100644 --- a/resources/images/switch_send_mode_tag_on.svg +++ b/resources/images/switch_send_mode_tag_on.svg @@ -1,4 +1,4 @@ - + diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 0983a57e89..f7b7194c63 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -2206,7 +2206,7 @@ void AmsReplaceMaterialDialog::create() identical_filament = new Label(this, _L("Identical filament: same brand, type and color")); identical_filament->SetFont(Label::Body_13); - identical_filament->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#00AE42"))); + identical_filament->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#009688"))); m_scrollview_groups = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL | wxVSCROLL); m_scrollview_groups->SetScrollRate(5, 5); diff --git a/src/slic3r/GUI/BBLStatusBarPrint.cpp b/src/slic3r/GUI/BBLStatusBarPrint.cpp index bce43e879a..1eaf82bb45 100644 --- a/src/slic3r/GUI/BBLStatusBarPrint.cpp +++ b/src/slic3r/GUI/BBLStatusBarPrint.cpp @@ -71,7 +71,7 @@ BBLStatusBarPrint::BBLStatusBarPrint(wxWindow *parent, int id) m_sizer_status_text = new wxBoxSizer(wxHORIZONTAL); m_link_show_error = new Label(top_panel, _L("Check the reason")); - m_link_show_error->SetForegroundColour(wxColour("#00AE42")); + m_link_show_error->SetForegroundColour(wxColour("#009688")); m_link_show_error->SetFont(::Label::Head_13); m_link_show_error->Bind(wxEVT_ENTER_WINDOW, [this](auto &e) { this->m_self->SetCursor(wxCURSOR_HAND); }); m_link_show_error->Bind(wxEVT_LEAVE_WINDOW, [this](auto &e) { this->m_self->SetCursor(wxCURSOR_ARROW); }); diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp index 4500cce72a..162a3d2d67 100644 --- a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp +++ b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp @@ -65,30 +65,18 @@ BaseTransparentDPIFrame::BaseTransparentDPIFrame( /* m_checkbox = new wxCheckBox(this, wxID_ANY, _L("Don't show again"), wxDefaultPosition, wxDefaultSize, 0); bSizer_button->Add(m_checkbox, 0, wxALIGN_LEFT);*/ bSizer_button->AddStretchSpacer(1); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), - std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); - StateColor btn_bg_white(std::pair(wxColour(23, 25, 22), StateColor::Pressed), std::pair(wxColour(43, 45, 42), StateColor::Hovered), - std::pair(wxColour(23, 25, 22), StateColor::Normal)); m_button_ok = new Button(this, ok_text); - m_button_ok->SetBackgroundColor(btn_bg_green); - m_button_ok->SetBorderWidth(0); - m_button_ok->SetTextColor(wxColour(0xFEFEFE)); - m_button_ok->SetFont(Label::Body_12); + m_button_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Window); m_button_ok->SetSize(wxSize(FromDIP(60), FromDIP(30))); m_button_ok->SetMinSize(wxSize(FromDIP(90), FromDIP(30))); - m_button_ok->SetCornerRadius(FromDIP(6)); bSizer_button->Add(m_button_ok, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10)); m_button_ok->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent &e) { deal_ok(); }); m_button_cancel = new Button(this, cancel_text); - m_button_cancel->SetBackgroundColor(btn_bg_white); - m_button_cancel->SetBorderColor(wxColour(93, 93, 91)); - m_button_cancel->SetFont(Label::Body_12); - m_button_cancel->SetTextColor(wxColour(0xFEFEFE)); + m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Window); m_button_cancel->SetSize(wxSize(FromDIP(65), FromDIP(30))); m_button_cancel->SetMinSize(wxSize(FromDIP(65), FromDIP(30))); - m_button_cancel->SetCornerRadius(FromDIP(6)); bSizer_button->Add(m_button_cancel, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10)); m_button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent &e) { deal_cancel(); }); diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 615fc78734..840699c6dc 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -112,7 +112,7 @@ HistoryWindow::HistoryWindow(wxWindow* parent, const std::vector& scroll_sizer->AddSpacer(FromDIP(15)); m_extruder_switch_btn = new SwitchButton(scroll_window); - m_extruder_switch_btn->SetBackgroundColour(wxColour(0, 174, 66)); + m_extruder_switch_btn->SetBackgroundColour(wxColour(0, 150, 136)); m_extruder_switch_btn->SetMinSize(wxSize(FromDIP(120), FromDIP(24))); m_extruder_switch_btn->SetMaxSize(wxSize(FromDIP(120), FromDIP(24))); m_extruder_switch_btn->SetLabels(_L("Left Nozzle"), _L("Right Nozzle")); diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 00660c648e..981f7f5392 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -563,8 +563,8 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent) StateColor btn_sync_bg_col(std::pair(wxColour("#CECECE"), StateColor::Pressed), std::pair(wxColour("#F8F8F8"), StateColor::Hovered), std::pair(wxColour("#F8F8F8"), StateColor::Normal)); - StateColor btn_sync_bd_col(std::pair(wxColour("#00AE42"), StateColor::Pressed), - std::pair(wxColour("#00AE42"), StateColor::Hovered), + StateColor btn_sync_bd_col(std::pair(wxColour("#009688"), StateColor::Pressed), + std::pair(wxColour("#009688"), StateColor::Hovered), std::pair(wxColour("#EEEEEE"), StateColor::Normal)); m_btn_sync->SetBackgroundColor(btn_sync_bg_col); m_btn_sync->SetBorderColor(btn_sync_bd_col); @@ -1623,7 +1623,7 @@ void CalibrationPresetPage::update_sync_button_status() { auto set_status = [this](bool synced) { StateColor synced_colour(std::pair(wxColour("#CECECE"), StateColor::Normal)); - StateColor not_synced_colour(std::pair(wxColour("#00AE42"), StateColor::Normal)); + StateColor not_synced_colour(std::pair(wxColour("#009688"), StateColor::Normal)); if (synced) { m_btn_sync->SetBorderColor(synced_colour); m_btn_sync->SetIcon("ams_nozzle_sync"); diff --git a/src/slic3r/GUI/CapsuleButton.cpp b/src/slic3r/GUI/CapsuleButton.cpp index 3249a21f90..2b89e43e59 100644 --- a/src/slic3r/GUI/CapsuleButton.cpp +++ b/src/slic3r/GUI/CapsuleButton.cpp @@ -10,10 +10,10 @@ static const wxColour BgNormalColor = wxColour("#FFFFFF"); static const wxColour BgSelectColor = wxColour("#EBF9F0"); static const wxColour TextNormalColor = wxColour("#000000"); -static const wxColour TextSelectColor = wxColour("#00AE42"); +static const wxColour TextSelectColor = wxColour("#009688"); static const wxColour BorderNormalColor = wxColour("#CECECE"); -static const wxColour BorderSelectColor = wxColour("#00AE42"); +static const wxColour BorderSelectColor = wxColour("#009688"); CapsuleButton::CapsuleButton(wxWindow *parent, wxWindowID id, const wxString &label, bool selected) : wxPanel(parent, id) { diff --git a/src/slic3r/GUI/FilamentGroupPopup.cpp b/src/slic3r/GUI/FilamentGroupPopup.cpp index 279d261b76..a5dac6e88a 100644 --- a/src/slic3r/GUI/FilamentGroupPopup.cpp +++ b/src/slic3r/GUI/FilamentGroupPopup.cpp @@ -10,7 +10,7 @@ namespace Slic3r { namespace GUI { static const wxColour LabelEnableColor = wxColour("#262E30"); static const wxColour LabelDisableColor = wxColour("#ACACAC"); static const wxColour GreyColor = wxColour("#6B6B6B"); -static const wxColour GreenColor = wxColour("#00AE42"); +static const wxColour GreenColor = wxColour("#009688"); static const wxColour BackGroundColor = wxColour("#FFFFFF"); diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp index 6360c1bc9e..360b22e6ff 100644 --- a/src/slic3r/GUI/FilamentMapDialog.cpp +++ b/src/slic3r/GUI/FilamentMapDialog.cpp @@ -111,11 +111,11 @@ bool try_pop_up_before_slice(bool is_slice_all, Plater* plater_ref, PartPlate* p } -static const StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), - std::pair(wxColour(0, 174, 66), StateColor::Normal)); +static const StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), + std::pair(wxColour(0, 150, 136), StateColor::Normal)); -static const StateColor btn_bd_green(std::pair(wxColour(0, 174, 66), StateColor::Normal)); +static const StateColor btn_bd_green(std::pair(wxColour(0, 150, 136), StateColor::Normal)); static const StateColor btn_text_green(std::pair(wxColour(255, 255, 254), StateColor::Normal)); diff --git a/src/slic3r/GUI/FilamentMapPanel.cpp b/src/slic3r/GUI/FilamentMapPanel.cpp index b44ce5368f..589c2097cd 100644 --- a/src/slic3r/GUI/FilamentMapPanel.cpp +++ b/src/slic3r/GUI/FilamentMapPanel.cpp @@ -10,7 +10,7 @@ static const wxColour BgSelectColor = wxColour("#EBF9F0"); static const wxColour BgDisableColor = wxColour("#CECECE"); static const wxColour BorderNormalColor = wxColour("#CECECE"); -static const wxColour BorderSelectedColor = wxColour("#00AE42"); +static const wxColour BorderSelectedColor = wxColour("#009688"); static const wxColour BorderDisableColor = wxColour("#EEEEEE"); static const wxColour TextNormalBlackColor = wxColour("#262E30"); diff --git a/src/slic3r/GUI/FilamentPickerDialog.cpp b/src/slic3r/GUI/FilamentPickerDialog.cpp index 973f6589fa..b926c85ebf 100644 --- a/src/slic3r/GUI/FilamentPickerDialog.cpp +++ b/src/slic3r/GUI/FilamentPickerDialog.cpp @@ -551,12 +551,12 @@ wxBoxSizer* FilamentPickerDialog::CreateButtonPanel() // standard button color style StateColor btn_bg_green( - 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_bd_green( - std::pair(wxColour(0, 174, 66), StateColor::Normal) + std::pair(wxColour(0, 150, 136), StateColor::Normal) ); StateColor btn_text_green( std::pair(wxColour(255, 255, 254), StateColor::Normal) @@ -747,7 +747,7 @@ void FilamentPickerDialog::OnButtonPaint(wxPaintEvent& event) } // Draw the green border - dc.SetPen(wxPen(wxColour("#00AE42"), 2)); // Green pen, 2px thick + dc.SetPen(wxPen(wxColour("#009688"), 2)); // Green pen, 2px thick dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRectangle(1, 1, COLOR_BTN_SIZE.GetWidth() - 1, COLOR_BTN_SIZE.GetHeight() - 1); } diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 5926b61ec5..5d59705e5e 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -4411,7 +4411,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding) auto link_text = [&](const std::string &label) { ImVec2 wiki_part_size = ImGui::CalcTextSize(label.c_str()); - ImColor HyperColor = ImColor(0, 174, 66, 255).Value; + ImColor HyperColor = ImColor(0, 150, 136, 255).Value; ImGui::PushStyleColor(ImGuiCol_Text, HyperColor.Value); imgui.text(label.c_str()); ImGui::PopStyleColor(); @@ -4437,7 +4437,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding) auto link_text_set_to_optional = [&](const std::string &label) { ImVec2 wiki_part_size = ImGui::CalcTextSize(label.c_str()); - ImColor HyperColor = ImColor(0, 174, 66, 255).Value; + ImColor HyperColor = ImColor(0, 150, 136, 255).Value; ImGui::PushStyleColor(ImGuiCol_Text, HyperColor.Value); imgui.text(label.c_str()); ImGui::PopStyleColor(); @@ -4465,7 +4465,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding) auto link_filament_group_wiki = [&](const std::string& label) { ImVec2 wiki_part_size = ImGui::CalcTextSize(label.c_str()); - ImColor HyperColor = ImColor(0, 174, 66, 255).Value; + ImColor HyperColor = ImColor(0, 150, 136, 255).Value; ImGui::PushStyleColor(ImGuiCol_Text, HyperColor.Value); imgui.text(label.c_str()); ImGui::PopStyleColor(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 4b67dcae71..36db9ecd81 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -587,7 +587,7 @@ void Sidebar::priv::flush_printer_sync(bool restart) *counter_sync_printer = 6; timer_sync_printer->Start(500); } - btn_sync_printer->SetBackgroundColorNormal((*counter_sync_printer & 1) ? "#F8F8F8" :"#00AE42"); + btn_sync_printer->SetBackgroundColorNormal((*counter_sync_printer & 1) ? "#F8F8F8" :"#009688"); if (--*counter_sync_printer <= 0) timer_sync_printer->Stop(); } @@ -1341,7 +1341,7 @@ bool Sidebar::priv::sync_extruder_list(bool &only_external_material) void Sidebar::priv::update_sync_status(const MachineObject *obj) { - StateColor not_synced_colour(std::pair(wxColour("#00AE42"), StateColor::Normal)); + StateColor not_synced_colour(std::pair(wxColour("#009688"), StateColor::Normal)); auto clear_all_sync_status = [this, ¬_synced_colour]() { panel_printer_preset->ShowBadge(false); panel_printer_bed->ShowBadge(false); @@ -1629,8 +1629,8 @@ Sidebar::Sidebar(Plater *parent) /*************************** 2. add printer content ************************/ p->m_panel_printer_content = new wxPanel(p->scrolled, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); p->m_panel_printer_content->SetBackgroundColour(wxColour(255, 255, 255)); - StateColor panel_bd_col(std::pair(wxColour("#00AE42"), StateColor::Pressed), - std::pair(wxColour("#00AE42"), StateColor::Hovered), + StateColor panel_bd_col(std::pair(wxColour("#009688"), StateColor::Pressed), + std::pair(wxColour("#009688"), StateColor::Hovered), std::pair(wxColour("#EEEEEE"), StateColor::Normal)); p->panel_printer_preset = new StaticBox(p->m_panel_printer_content); @@ -1767,8 +1767,8 @@ Sidebar::Sidebar(Plater *parent) std::pair(wxColour("#F8F8F8"), StateColor::Hovered), std::pair(wxColour("#F8F8F8"), StateColor::Normal)); StateColor btn_sync_bd_col( - std::pair(wxColour("#00AE42"), StateColor::Pressed), - std::pair(wxColour("#00AE42"), StateColor::Hovered), + std::pair(wxColour("#009688"), StateColor::Pressed), + std::pair(wxColour("#009688"), StateColor::Hovered), std::pair(wxColour("#EEEEEE"), StateColor::Normal)); btn_sync->SetBackgroundColor(btn_sync_bg_col); btn_sync->SetBorderColor(btn_sync_bd_col); diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index ceb045c810..440692d79e 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -1138,7 +1138,7 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent) m_wiki_link = new Label(single_panel, _L("View wiki")); m_wiki_link->SetFont(Label::Body_13); - m_wiki_link->SetForegroundColour(wxColour("#00AE42")); + m_wiki_link->SetForegroundColour(wxColour("#009688")); m_wiki_link->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) { SetCursor(wxCURSOR_HAND); }); m_wiki_link->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) { SetCursor(wxCURSOR_ARROW); }); m_wiki_link->Bind(wxEVT_LEFT_DOWN, &PrinterPartsDialog::OnWikiClicked, this); @@ -1239,7 +1239,7 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent) multiple_wiki_link = new Label(multiple_panel, _L("View wiki")); multiple_wiki_link->SetFont(Label::Body_13); - multiple_wiki_link->SetForegroundColour(wxColour("#00AE42")); + multiple_wiki_link->SetForegroundColour(wxColour("#009688")); multiple_wiki_link->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) { SetCursor(wxCURSOR_HAND); }); multiple_wiki_link->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) { SetCursor(wxCURSOR_ARROW); }); multiple_wiki_link->Bind(wxEVT_LEFT_DOWN, &PrinterPartsDialog::OnWikiClicked, this); diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index a4251fc4a7..32e992f67f 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -1434,8 +1434,8 @@ void ConfirmBeforeSendDialog::edit_cancel_button_txt(const wxString& txt, bool s if (switch_green) { - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); m_button_cancel->SetBackgroundColor(btn_bg_green); m_button_cancel->SetBorderColor(*wxWHITE); @@ -2258,7 +2258,7 @@ void InputIpAddressDialog::on_dpi_changed(const wxRect& suggested_rect) wxBoxSizer *button_sizer = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 1c53da46e0..9aecca6bf4 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -443,7 +443,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_link_edit_nozzle = new Label(m_scroll_area, wxEmptyString); m_link_edit_nozzle->SetFont(::Label::Body_13); - m_link_edit_nozzle->SetForegroundColour(0x00ae42); + m_link_edit_nozzle->SetForegroundColour("#009688"); m_link_edit_nozzle->SetBackgroundColour(*wxWHITE); m_link_edit_nozzle->Bind(wxEVT_ENTER_WINDOW, [this](auto &e) { SetCursor(wxCURSOR_HAND); }); m_link_edit_nozzle->Bind(wxEVT_LEAVE_WINDOW, [this](auto &e) { SetCursor(wxCURSOR_ARROW); }); @@ -575,7 +575,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) wxBoxSizer *m_sizer_prepare = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_pcont = new wxBoxSizer(wxVERTICAL); - m_btn_bg_enable = StateColor(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + m_btn_bg_enable = StateColor(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(wxColour(0, 150, 136), StateColor::Normal)); m_button_ensure = new Button(m_panel_prepare, _L("Send")); m_button_ensure->SetBackgroundColor(m_btn_bg_enable); @@ -4872,7 +4872,7 @@ void PrintOptionItem::doRender(wxDC& dc) if (text_key == selected_key) { - const wxColour& clr = m_enable ? StateColor::darkModeColorFor("#00AE42") : StateColor::darkModeColorFor(wxColour(144, 144, 144)); + const wxColour& clr = m_enable ? StateColor::darkModeColorFor("#009688") : StateColor::darkModeColorFor(wxColour(144, 144, 144)); dc.SetPen(wxPen(clr)); dc.SetTextForeground(clr); @@ -4975,7 +4975,7 @@ void SendModeSwitchButton::doRender(wxDC &dc) if (is_selected) { dc.DrawBitmap(m_img_selected.bmp(), wxPoint(0, 0)); dc.DrawBitmap(m_img_selected_tag.bmp(), wxPoint(left, (size.y - m_img_selected_tag.GetBmpSize().y) / 2)); - dc.SetTextForeground(0x00AE42); + dc.SetTextForeground("#009688"); }else { dc.DrawBitmap(m_img_unselected.bmp(), wxPoint(0, 0)); dc.DrawBitmap(m_img_unselected_tag.bmp(), wxPoint(left, (size.y - m_img_selected_tag.GetBmpSize().y) / 2)); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 0ad4df5a28..2236d8305f 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1965,7 +1965,7 @@ wxBoxSizer* StatusBasePanel::create_filament_group(wxWindow* parent) auto m_title_filament_loading = new Label(m_scale_panel, _L("Filament loading...")); m_title_filament_loading->SetBackgroundColour(*wxWHITE); - m_title_filament_loading->SetForegroundColour(wxColour(27, 136, 68)); + m_title_filament_loading->SetForegroundColour(wxColour(0, 137, 123)); m_title_filament_loading->SetFont(::Label::Body_14); m_img_filament_loading = new wxStaticBitmap(m_scale_panel, wxID_ANY, create_scaled_bitmap("filament_load_fold", this, 24), wxDefaultPosition, wxSize(FromDIP(24), FromDIP(24)), 0); diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 1fa9f7b52f..1fe5ba548a 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -993,7 +993,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) : /* m_checkbox = new wxCheckBox(this, wxID_ANY, _L("Don't show again"), wxDefaultPosition, wxDefaultSize, 0); bSizer_button->Add(m_checkbox, 0, wxALIGN_LEFT);*/ bSizer_button->AddStretchSpacer(1); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); m_button_ok = new Button(m_show_page, _L("Synchronize now")); m_button_ok->SetBackgroundColor(btn_bg_green); @@ -2021,7 +2021,7 @@ void SyncAmsInfoDialog::Enable_Auto_Refill(bool enable) { if (!m_ams_backup_tip) { return; } if (enable) { - m_ams_backup_tip->SetForegroundColour(wxColour("#00AE42")); + m_ams_backup_tip->SetForegroundColour(wxColour("#009688")); } else { m_ams_backup_tip->SetForegroundColour(wxColour(0x90, 0x90, 0x90)); } diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index c2d95b519e..f1b40d66a0 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -134,8 +134,8 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_panel_option_right->SetMaxSize(wxSize(FromDIP(180), -1)); StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), - std::pair(wxColour(27, 136, 68), StateColor::Pressed), - std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 137, 123), StateColor::Pressed), + std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), diff --git a/src/slic3r/GUI/Widgets/AMSItem.hpp b/src/slic3r/GUI/Widgets/AMSItem.hpp index 6a5afe5ac6..d643e35496 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.hpp +++ b/src/slic3r/GUI/Widgets/AMSItem.hpp @@ -14,7 +14,7 @@ #include -#define AMS_CONTROL_BRAND_COLOUR wxColour(0, 174, 66) +#define AMS_CONTROL_BRAND_COLOUR wxColour(0, 150, 136) #define AMS_CONTROL_GRAY700 wxColour(107, 107, 107) #define AMS_CONTROL_GRAY800 wxColour(50, 58, 61) #define AMS_CONTROL_GRAY500 wxColour(172, 172, 172) diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp index f0b180f255..5a18933291 100644 --- a/src/slic3r/GUI/Widgets/FanControl.cpp +++ b/src/slic3r/GUI/Widgets/FanControl.cpp @@ -375,7 +375,7 @@ FanControlNew::FanControlNew(wxWindow *parent, const AirDuctData &fan_data, int sizer_control->Add(sizer_control_top, 0, wxEXPAND, 0); m_static_status_name = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END | wxALIGN_CENTER_HORIZONTAL); - m_static_status_name->SetForegroundColour(wxColour("#00AE42")); + m_static_status_name->SetForegroundColour(wxColour("#009688")); m_static_status_name->SetBackgroundColour(wxColour(248, 248, 248)); m_static_status_name->SetFont(Label::Head_18); m_static_status_name->SetMinSize(wxSize(FromDIP(100), -1)); diff --git a/src/slic3r/GUI/Widgets/StepCtrl.cpp b/src/slic3r/GUI/Widgets/StepCtrl.cpp index 503554b670..8c20076a23 100644 --- a/src/slic3r/GUI/Widgets/StepCtrl.cpp +++ b/src/slic3r/GUI/Widgets/StepCtrl.cpp @@ -366,7 +366,7 @@ FilamentStepIndicator::FilamentStepIndicator(wxWindow* parent, wxWindowID id, co clr_bar = 0xE1E1E1; clr_step = StateColor( std::make_pair(0xACACAC, (int)StateColor::Disabled), - std::make_pair(0x00AE42, 0)); + std::make_pair(0x009688, 0)); clr_text = StateColor( std::make_pair(0xACACAC, (int)StateColor::Disabled), std::make_pair(0x323A3D, (int)StateColor::Checked), @@ -404,7 +404,7 @@ void FilamentStepIndicator::doRender(wxDC& dc) } dc.SetFont(::Label::Head_16); - dc.SetTextForeground(wxColour(0, 174, 66)); + dc.SetTextForeground(wxColour(0, 150, 136)); int circleX = 20; int circleY = 20; wxSize sz = dc.GetTextExtent(L"Loading"); diff --git a/src/slic3r/GUI/Widgets/SwitchButton.cpp b/src/slic3r/GUI/Widgets/SwitchButton.cpp index 0c040325c3..7108dbe319 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.cpp @@ -265,7 +265,7 @@ void SwitchBoard::doRender(wxDC &dc) /*left*/ if (switch_left) { - is_enable ? dc.SetBrush(wxBrush(wxColour(0, 174, 66))) : dc.SetBrush(disable_color); + is_enable ? dc.SetBrush(wxBrush(wxColour(0, 150, 136))) : dc.SetBrush(disable_color); dc.DrawRoundedRectangle(0, 0, GetSize().x / 2, GetSize().y, 8); } @@ -283,7 +283,7 @@ void SwitchBoard::doRender(wxDC &dc) /*right*/ if (switch_right) { - if (is_enable) {dc.SetBrush(wxBrush(wxColour(0, 174, 66))); + if (is_enable) {dc.SetBrush(wxBrush(wxColour(0, 150, 136))); } else {dc.SetBrush(disable_color);} dc.DrawRoundedRectangle(GetSize().x / 2, 0, GetSize().x / 2, GetSize().y, 8); }