From ae75d8b8a559a0f96532dc558201520b7b97238e Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Thu, 16 Jan 2025 16:52:39 +0800 Subject: [PATCH] ENH: update some sentences and refine ui jira:NONE Signed-off-by: xun.zhang Change-Id: Ibba2d6c880fcb810f861cf06eb7a30a512cbbacf (cherry picked from commit 5195e824814a1ee38d789f331ec86e73807d412a) --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/GUI_Factories.cpp | 4 ++-- src/slic3r/GUI/Plater.cpp | 10 +++++----- src/slic3r/GUI/SelectMachine.cpp | 2 +- src/slic3r/GUI/WipeTowerDialog.cpp | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 1cb9c6693f..c1f1e2d075 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1448,7 +1448,7 @@ static std::pair construct_extruder_unprintable_error(ObjectFilament model_prefix = (boost::format(_u8L("The model %s is")) % object_result.object_filaments.front().object->name).str(); tips[idx] += model_prefix; tips[idx] += (boost::format(_u8L(" located within the %s only area, making it impossible to print with the filaments assigned to %s.\n" - "Please move the model out of the %s only area or adjust the filament assignment\n")) % opposite_nozzle_name % nozzle_name % opposite_nozzle_name).str(); + "Please move the model out of the %s only area or adjust the filament assignment.")) % opposite_nozzle_name % nozzle_name % opposite_nozzle_name).str(); if (object_result.object_filaments.size() > 1) { for (ObjectFilamentInfo& object_filament : left_unprintable_objects) diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 80cd7e7a44..8c50b43066 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -1485,7 +1485,7 @@ void MenuFactory::create_filament_action_menu(bool init, int active_filament_men []() { return plater()->sidebar().combos_filament().size() > 1; }, m_parent); } - const int item_id = menu->FindItem(_L("Delete then replace with")); + const int item_id = menu->FindItem(_L("Merge with")); if (item_id != wxNOT_FOUND) menu->Destroy(item_id); @@ -1503,7 +1503,7 @@ void MenuFactory::create_filament_action_menu(bool init, int active_filament_men [i](wxCommandEvent&) { plater()->sidebar().change_filament(-2, i); }, *icons[i], menu, []() { return true; }, m_parent); } - append_submenu(menu, sub_menu, wxID_ANY, _L("Delete then replace with"), "", "", + append_submenu(menu, sub_menu, wxID_ANY, _L("Merge with"), "", "", [filaments_cnt]() { return filaments_cnt > 1; }, m_parent); } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 409c1fb99b..2ffc98f472 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -9170,13 +9170,13 @@ bool Plater::priv::check_ams_status_impl(bool is_slice_all) { SyncInfoDialog(wxWindow *parent) : MessageDialog(parent, - _L("It is detected that you have not synchronized the nozzle and AMS information.\n" - "If you synchronize it before slicing, the filament arrangement will be more reasonable.\n" - "Do you need to synchronize it ?"), + _L("The nozzle type and AMS quantity information has not been synced from the connected printer.\n" + "After syncing, software can optimize printing time and filament usage when slicing.\n" + "Would you like to sync now ?"), _L("Warning"), 0) { add_button(wxID_YES, true, _L("Sync now")); - add_button(wxID_NO, true, _L("Out of sync")); + add_button(wxID_NO, true, _L("Later")); } } dlg(q); dlg.Fit(); @@ -13096,7 +13096,7 @@ bool check_printer_initialized(MachineObject *obj) } if (!has_been_initialized) { - MessageDialog dlg(wxGetApp().plater(), _L("It is detected that the nozzle type is not set. please set the nozzle first and then perform the current operation again."), _L("Warning"), wxOK | wxICON_WARNING); + MessageDialog dlg(wxGetApp().plater(), _L("The nozzle type is not set. Please set the nozzle and try again."), _L("Warning"), wxOK | wxICON_WARNING); dlg.ShowModal(); PrinterPartsDialog* print_parts_dlg = new PrinterPartsDialog(nullptr); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 47a165004b..65cc1ae112 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -532,7 +532,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_txt_mapping_sugs->SetMinSize(wxSize(FromDIP(580), -1)); m_txt_mapping_sugs->SetMaxSize(wxSize(FromDIP(580), -1)); m_txt_mapping_sugs->SetBackgroundColour(*wxWHITE); - m_txt_mapping_sugs->SetLabel(_L("Your material arrangement method is not optimal.")); + m_txt_mapping_sugs->SetLabel(_L("Your filament arrangement method is not optimal.")); m_mapping_sugs_sizer->Add(m_img_mapping_sugs, 0, wxALIGN_CENTER, 0); m_mapping_sugs_sizer->Add(m_txt_mapping_sugs, 0, wxALIGN_CENTER, 0); diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 6e563bf642..5b0dfe9bb5 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -355,6 +355,7 @@ WipingDialog::WipingDialog(wxWindow* parent, const std::vector& matrix, c e.Skip(); }); + CenterOnParent(); wxGetApp().UpdateDlgDarkUI(this); }