diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 8c42c2690..8d26254b1 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -172,7 +172,7 @@ void AppConfig::set_defaults() if (get("enable_append_color_by_sync_ams").empty()) set_bool("enable_append_color_by_sync_ams", false); if (get("enable_merge_color_by_sync_ams").empty()) - set_bool("enable_merge_color_by_sync_ams", true); + set_bool("enable_merge_color_by_sync_ams", false); if (get("zoom_to_mouse").empty()) set_bool("zoom_to_mouse", false); diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 9c72755c8..72a45c745 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -354,13 +354,13 @@ AmsMapingPopup::AmsMapingPopup(wxWindow *parent) m_right_extra_slot->SetMinSize(wxSize(FromDIP(48), FromDIP(60))); m_right_extra_slot->SetMaxSize(wxSize(FromDIP(48), FromDIP(60))); - m_sizer_ams_left->Add(create_split_sizer(m_left_marea_panel, _L("Left Ams")), 0, wxEXPAND, 0); + m_sizer_ams_left->Add(create_split_sizer(m_left_marea_panel, _L("Left AMS")), 0, wxEXPAND, 0); m_sizer_ams_left->Add(m_sizer_ams_basket_left, 0, wxEXPAND|wxTOP, FromDIP(8)); m_sizer_ams_left->Add(create_split_sizer(m_left_marea_panel, _L("External")), 0, wxEXPAND|wxTOP, FromDIP(8)); //m_sizer_ams_left->Add(m_left_extra_slot, 0, wxEXPAND|wxTOP, FromDIP(8)); m_sizer_ams_left->Add(sizer_temp, 0, wxEXPAND | wxTOP, FromDIP(8)); - m_right_split_ams_sizer = create_split_sizer(m_right_marea_panel, _L("Right Ams")); + m_right_split_ams_sizer = create_split_sizer(m_right_marea_panel, _L("Right AMS")); m_sizer_ams_right->Add(m_right_split_ams_sizer, 0, wxEXPAND, 0); m_sizer_ams_right->Add(m_sizer_ams_basket_right, 0, wxEXPAND|wxTOP, FromDIP(8)); m_sizer_ams_right->Add(create_split_sizer(m_right_marea_panel, _L("External")), 0, wxEXPAND|wxTOP, FromDIP(8)); @@ -575,7 +575,7 @@ void AmsMapingPopup::update(MachineObject* obj) else if (m_show_type == ShowType::RIGHT) { m_right_marea_panel->Show(); - set_sizer_title(m_right_split_ams_sizer, _L("Right Ams")); + set_sizer_title(m_right_split_ams_sizer, _L("Right AMS")); m_right_extra_slot->Show(); } else if (m_show_type == ShowType::LEFT_AND_RIGHT) @@ -585,7 +585,7 @@ void AmsMapingPopup::update(MachineObject* obj) m_left_marea_panel->Show(); m_left_extra_slot->Show(); m_right_marea_panel->Show(); - set_sizer_title(m_right_split_ams_sizer, _L("Right Ams")); + set_sizer_title(m_right_split_ams_sizer, _L("Right AMS")); m_right_extra_slot->Show(); } } @@ -1389,7 +1389,7 @@ 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 filaments in AMS")); m_img_enable_ams->Show(); m_img_disable_ams->Hide(); } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index b55ca2fc1..4d280f818 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2774,8 +2774,11 @@ void Sidebar::update_sync_status(const MachineObject *obj) void Sidebar::load_ams_list(std::string const &device, MachineObject* obj) { std::map filament_ams_list = build_filament_ams_list(obj); - - p->ams_list_device = device; + bool device_change = false; + if (p->ams_list_device != device) { + p->ams_list_device = device; + device_change = true; + } BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": %1% items") % filament_ams_list.size(); if (wxGetApp().preset_bundle->filament_ams_list == filament_ams_list) return; @@ -2783,7 +2786,9 @@ void Sidebar::load_ams_list(std::string const &device, MachineObject* obj) for (auto c : p->combos_filament){ c->update(); - c->ShowBadge(false);//change printer,then clear badge + if (device_change) { + c->ShowBadge(false);//change printer,then clear badge + } } p->combo_printer->update(); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index ac1e96e9e..3c9ec35a1 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1761,7 +1761,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vectorAddStretchSpacer(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)); - m_button_ok = new Button(this, _L("OK")); + m_button_ok = new Button(this, _L("Synchronize now")); m_button_ok->SetBackgroundColor(btn_bg_green); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetFont(Label::Body_12); - m_button_ok->SetSize(BUTTON_SIZE); - m_button_ok->SetMinSize(BUTTON_SIZE); + m_button_ok->SetSize(wxSize(FromDIP(90), FromDIP(24))); + m_button_ok->SetMinSize(wxSize(FromDIP(90), FromDIP(24))); m_button_ok->SetCornerRadius(FromDIP(12)); bSizer_button->Add(m_button_ok, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10)); @@ -1260,7 +1260,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) : StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); - m_button_cancel = new Button(this, _L("Cancel")); + m_button_cancel = new Button(this, m_input_info.cancel_text_to_later ? _L("Later") :_L("Cancel")); m_button_cancel->SetBackgroundColor(btn_bg_white); m_button_cancel->SetBorderColor(wxColour(38, 46, 48)); m_button_cancel->SetFont(Label::Body_12); @@ -2105,7 +2105,7 @@ void SyncAmsInfoDialog::show_status(PrintDialogStatus status, std::vectoricon_1 = ScalableBitmap(); return; } - this->icon_1 = ScalableBitmap(this, icon.ToStdString(), 16); + this->icon_1 = ScalableBitmap(this, icon.ToStdString(), 14); Rescale(); } @@ -237,6 +237,7 @@ void TextInput::render(wxDC& dc) if (pt.x * 2 + szIcon.x + 0 + labelSize.x < size.x) pt.x = (size.x - (szIcon.x + 0 + labelSize.x)) / 2; } + pt.x += szIcon.x / 4.f; dc.DrawBitmap(icon_1.bmp(), pt); pt.x += szIcon.x + 0; }