diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index d0cf3719d0..4da664a175 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -1278,7 +1278,7 @@ bool AmsMapingPopup::ProcessLeftDown(wxMouseEvent &event) void AmsMapingPopup::paintEvent(wxPaintEvent &evt) { wxPaintDC dc(this); - dc.SetPen(wxColour(0xAC, 0xAC, 0xAC)); + dc.SetPen(wxPen(StateColor::darkModeColorFor(wxColour("#009688")), FromDIP(2))); // Orca: colorful accent border for separation (dark-mode aware) dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRoundedRectangle(0, 0, GetSize().x, GetSize().y, 0); } @@ -1593,7 +1593,7 @@ AmsMapingTipPopup::AmsMapingTipPopup(wxWindow *parent) m_title_enable_ams->Wrap(-1); sizer_enable_ams->Add(m_title_enable_ams, 0, 0, 0); - m_tip_enable_ams = new wxStaticText(m_panel_enable_ams, wxID_ANY, _L("Print with filaments in the AMS"), wxDefaultPosition, wxDefaultSize, 0); + m_tip_enable_ams = new wxStaticText(m_panel_enable_ams, wxID_ANY, _L("Print with filament in the AMS"), wxDefaultPosition, wxDefaultSize, 0); // Orca: kept string (existing translation) m_tip_enable_ams->SetMinSize(wxSize(FromDIP(200), FromDIP(50))); m_tip_enable_ams->Wrap(FromDIP(200)); m_tip_enable_ams->SetForegroundColour(*wxBLACK); @@ -1629,7 +1629,7 @@ AmsMapingTipPopup::AmsMapingTipPopup(wxWindow *parent) m_title_disable_ams->Wrap(-1); sizer_disable_ams->Add(m_title_disable_ams, 0, 0, 0); - m_tip_disable_ams = new wxStaticText(m_panel_disable_ams, wxID_ANY, _L("Print with the filament mounted on the back of chassis"), wxDefaultPosition, wxDefaultSize, 0); + m_tip_disable_ams = new wxStaticText(m_panel_disable_ams, wxID_ANY, _L("Print with filament on external spool"), wxDefaultPosition, wxDefaultSize, 0); // Orca: kept string (existing translation) m_tip_disable_ams->SetMinSize(wxSize(FromDIP(200), FromDIP(50))); m_tip_disable_ams->Wrap(FromDIP(200)); m_tip_disable_ams->SetForegroundColour(*wxBLACK); @@ -1690,7 +1690,8 @@ AmsHumidityTipPopup::AmsHumidityTipPopup(wxWindow* parent) humidity_level_list = new AmsHumidityLevelList(this); curr_humidity_img = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("hum_level1_light", this, 132), wxDefaultPosition, wxSize(FromDIP(132), FromDIP(132)), 0); - m_staticText_note = new Label(this, _L("Please change the desiccant when it is too wet. The indicator may not represent accurately in following cases : when the lid is open or the desiccant pack is changed. it take hours to absorb the moisture, low temperatures also slow down the process.")); + // Orca: kept the grammatically-corrected desiccant note (existing translation) + m_staticText_note = new Label(this, _L("Please change the desiccant when it is too wet. The indicator may not represent accurately in following cases: when the lid is open or the desiccant pack is changed. It takes a few hours to absorb the moisture, and low temperatures also slow down the process.")); m_staticText_note->SetMinSize(wxSize(FromDIP(680), -1)); m_staticText_note->SetMaxSize(wxSize(FromDIP(680), -1)); m_staticText_note->Wrap(FromDIP(680)); @@ -1815,7 +1816,7 @@ AmsTutorialPopup::AmsTutorialPopup(wxWindow* parent) wxBoxSizer* sizer_main; sizer_main = new wxBoxSizer(wxVERTICAL); - text_title = new Label(this, Label::Head_14, _L("Config which AMS slot should be used for a filament used in the print job")); + text_title = new Label(this, Label::Head_14, _L("Configure which AMS slot should be used for a filament used in the print job.")); // Orca: kept string (existing translation) text_title->SetSize(wxSize(FromDIP(350), -1)); text_title->Wrap(FromDIP(350)); sizer_main->Add(text_title, 0, wxALIGN_CENTER | wxTOP, 18); @@ -1926,7 +1927,7 @@ AmsIntroducePopup::AmsIntroducePopup(wxWindow* parent) m_staticText_top->Wrap(-1); bSizer4->Add(m_staticText_top, 0, wxALL, 5); - m_staticText_bottom = new Label(this, _L("Print using materials mounted on the back of the case")); + m_staticText_bottom = new Label(this, _L("Print using filament on external spool.")); // Orca: kept string (existing translation) m_staticText_bottom->Wrap(-1); m_staticText_bottom->SetFont(::Label::Body_13); m_staticText_bottom->SetForegroundColour(wxColour("#6B6B6B")); @@ -1962,13 +1963,13 @@ void AmsIntroducePopup::set_mode(bool enable_ams) { if (enable_ams) { m_staticText_top->SetLabelText(_L("Enable AMS")); - m_staticText_bottom->SetLabelText(_L("Print with filaments in AMS")); + m_staticText_bottom->SetLabelText(_L("Print with filament in AMS")); // Orca: kept string (existing translation) m_img_enable_ams->Show(); m_img_disable_ams->Hide(); } else { m_staticText_top->SetLabelText(_L("Do not Enable AMS")); - m_staticText_bottom->SetLabelText(_L("Print with filaments mounted on the back of the chassis")); + m_staticText_bottom->SetLabelText(_L("Print with filament on external spool")); // Orca: kept string (existing translation) m_staticText_bottom->SetMinSize(wxSize(FromDIP(180), -1)); m_staticText_bottom->Wrap(FromDIP(180)); m_img_enable_ams->Hide(); @@ -2111,9 +2112,9 @@ void AmsReplaceMaterialDialog::create() label_txt->SetMaxSize(wxSize(FromDIP(380), -1)); label_txt->Wrap(FromDIP(380)); - identical_filament = new Label(this, _L("Identical filament: same brand, type and color")); + identical_filament = new Label(this, _L("Identical filament: same brand, type and color.")); // Orca: kept trailing period (existing translation) identical_filament->SetFont(Label::Body_13); - identical_filament->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#00AE42"))); + identical_filament->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#009688"))); // Orca: accent teal (not brand green) m_scrollview_groups = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL | wxVSCROLL); m_scrollview_groups->SetScrollRate(5, 5); @@ -2142,7 +2143,7 @@ void AmsReplaceMaterialDialog::create() std::pair(wxColour(38, 46, 48), StateColor::Enabled)); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(0, 174, 66), StateColor::Normal)); + StateColor btn_bg_green(std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(0, 150, 136), StateColor::Normal)); // Orca: accent teal button (not brand green) m_button_sizer->Add( 0, 0, 1, wxEXPAND, 0 ); m_main_sizer->Add(0,0,0, wxTOP, FromDIP(12)); @@ -2197,7 +2198,7 @@ AmsRMGroup* AmsReplaceMaterialDialog::create_backup_group(wxString gname, std::m void AmsReplaceMaterialDialog::paintEvent(wxPaintEvent& evt) { wxPaintDC dc(this); - dc.SetPen(wxColour(0xAC, 0xAC, 0xAC)); + dc.SetPen(StateColor::darkModeColorFor(wxColour("#DBDBDB"))); // Orca: popup border color fixed for dark mode dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRoundedRectangle(0, 0, GetSize().x, GetSize().y, 0); } @@ -2332,7 +2333,7 @@ void AmsReplaceMaterialDialog::update_to_nozzle(int nozzle_id) } else if (!m_obj->GetFilaSystem()->IsAutoRefillEnabled()) { - label_txt->SetLabelText(_L("AMS filament backup is not enabled, please enable it in the AMS settings.")); + label_txt->SetLabelText(_L("AMS filament backup is not enabled; please enable it in the AMS settings.")); // Orca: kept semicolon (existing translation) } else {