From 868b056f1a88002bce10dd8c6724ba3fc97a32d0 Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Tue, 21 Jan 2025 16:27:37 +0800 Subject: [PATCH] ENH: modify description for filament group mode jira:NONE Signed-off-by: xun.zhang Change-Id: Ia0098b0aced6c764962874197da8d63fc7a06d6d --- src/slic3r/GUI/FilamentGroupPopup.cpp | 10 ++++------ src/slic3r/GUI/FilamentMapPanel.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/slic3r/GUI/FilamentGroupPopup.cpp b/src/slic3r/GUI/FilamentGroupPopup.cpp index 2f9a84dde..0c70cfbf3 100644 --- a/src/slic3r/GUI/FilamentGroupPopup.cpp +++ b/src/slic3r/GUI/FilamentGroupPopup.cpp @@ -50,14 +50,12 @@ static void set_prefered_map_mode(FilamentMapMode mode) FilamentGroupPopup::FilamentGroupPopup(wxWindow *parent) : PopupWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS) { const wxString AutoForFlushLabel = _L("Filament-Saving Mode"); - const wxString AutoForMatchLabel = _L("Convenient Mode"); + const wxString AutoForMatchLabel = _L("Convenience Mode"); const wxString ManualLabel = _L("Custom Mode"); - const wxString AutoForFlushDetail = _L("Calculate the best filament grouping " - "to minimize filament waste. Need to manually place filaments on the printer " - "based on slicing results."); - const wxString AutoForMatchDetail = _L("Calculate the filament grouping based on the printer's filaments, reducing the need for adjusting filaments at the printer."); - const wxString ManualDetail = _L("Manually assign filament to the left or right nozzle."); + const wxString AutoForFlushDetail = _L("Recommends filament grouping for the left and right nozzles based on the most filament-saving principles to minimize waste"); + const wxString AutoForMatchDetail = _L("Recommends filament grouping for the left and right nozzles based on the printer's actual filament status, reducing the need for manual filament adjustment"); + const wxString ManualDetail = _L("Manually assign filament to the left or right nozzle"); const wxString AutoForFlushDesp = ""; //_L("(Post-slicing arrangement)"); const wxString ManualDesp = ""; diff --git a/src/slic3r/GUI/FilamentMapPanel.cpp b/src/slic3r/GUI/FilamentMapPanel.cpp index 9e878c7d1..130946269 100644 --- a/src/slic3r/GUI/FilamentMapPanel.cpp +++ b/src/slic3r/GUI/FilamentMapPanel.cpp @@ -282,14 +282,13 @@ void GUI::FilamentMapBtnPanel::Show() FilamentMapAutoPanel::FilamentMapAutoPanel(wxWindow *parent, FilamentMapMode mode, bool machine_synced) : wxPanel(parent) { - const wxString AutoForFlushDetail = _L("Calculate the best filament grouping " - "to minimize filament waste. Need to manually place filaments on the printer " - "based on slicing results."); - const wxString AutoForMatchDetail = _L("Calculate the filament grouping based on the printer's filaments, reducing the need for adjusting filaments at the printer."); + const wxString AutoForFlushDetail = _L("Recommends filament grouping for the left and right nozzles based on the most filament-saving principles to minimize waste"); + + const wxString AutoForMatchDetail = _L("Recommends filament grouping for the left and right nozzles based on the printer's actual filament status, reducing the need for manual filament adjustment"); auto sizer = new wxBoxSizer(wxHORIZONTAL); m_flush_panel = new FilamentMapBtnPanel(this, _L("Filament-Saving Mode"), AutoForFlushDetail, "flush_mode_panel_icon"); - m_match_panel = new FilamentMapBtnPanel(this, _L("Convenient Mode"), AutoForMatchDetail, "match_mode_panel_icon"); + m_match_panel = new FilamentMapBtnPanel(this, _L("Convenience Mode"), AutoForMatchDetail, "match_mode_panel_icon"); if (!machine_synced) m_match_panel->Enable(false);