From 6871bdd3b9a2ba76b0d968070a55ada68daad2a6 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Sat, 10 May 2025 14:46:11 +0800 Subject: [PATCH] ENH:update text jira: STUDIO-12117 Change-Id: Idb8af2fd8826c6e0098dbb9ece1da6b8b9109c96 (cherry picked from commit 38364e36c19ba3d35bf08656d5cc62bb5849f21f) --- src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp | 2 +- src/slic3r/GUI/ObjColorDialog.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 16 +--------------- src/slic3r/GUI/SelectMachine.cpp | 1 - src/slic3r/GUI/SyncAmsInfoDialog.cpp | 1 - 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp index 21944ecb95..602b622f45 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp @@ -668,7 +668,7 @@ void GLGizmoAdvancedCut::perform_cut(const Selection& selection) if (its_num_open_edges(new_objects[i]->volumes[j]->mesh().its) > 0) { if (!is_showed_dialog) { is_showed_dialog = true; - MessageDialog dlg(nullptr, _L("non-manifold edges be caused by cut tool, do you want to fix it now?"), "", wxYES | wxCANCEL); + MessageDialog dlg(nullptr, _L("non-manifold edges be caused by cut tool, do you want to fix it now?"), "", wxYES | wxNO); int ret = dlg.ShowModal(); if (ret == wxID_YES) { user_fix_model = true; diff --git a/src/slic3r/GUI/ObjColorDialog.cpp b/src/slic3r/GUI/ObjColorDialog.cpp index 7baada86b0..f5bf0120b4 100644 --- a/src/slic3r/GUI/ObjColorDialog.cpp +++ b/src/slic3r/GUI/ObjColorDialog.cpp @@ -197,7 +197,7 @@ ObjColorDialog::ObjColorDialog(wxWindow *parent, Slic3r::ObjDialogInOut &in_out, else { wxBoxSizer * error_mtl_sizer = new wxBoxSizer(wxVERTICAL); - wxStaticText *error_mtl_title = new wxStaticText(this, wxID_ANY, _L("Some faces not define color.")); + wxStaticText *error_mtl_title = new wxStaticText(this, wxID_ANY, _L("Some faces don't have color defined.")); if (!in_out.lost_material_name.empty()) { error_mtl_title->SetLabel(_L("mtl file exist error,could not find the material:") + " " + in_out.lost_material_name + "."); } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 1eb19f6fcb..6d2a68d529 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -14150,21 +14150,7 @@ void publish(Model &model, SaveStrategy strategy) { } } - // Orca: don't show this in silence mode - if (exist_new && !(strategy & SaveStrategy::Silence)) { - MessageDialog dialog(nullptr, - _L("Are you sure you want to store original SVGs with their local paths into the 3MF file?\n" - "If you hit 'NO', all SVGs in the project will not be editable any more."), - _L("Private protection"), wxYES_NO | wxICON_QUESTION); - if (dialog.ShowModal() == wxID_NO){ - for (ModelObject *object : model.objects) - for (ModelVolume *volume : object->volumes) - if (volume->emboss_shape.has_value()) - volume->emboss_shape.reset(); - } - } - - for (SvgFile* svgfile : svgfiles){ + for (SvgFile *svgfile : svgfiles) { if (!svgfile->path_in_3mf.empty()) continue; // already suggested path (previous save) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index fb12d5f328..b019281b83 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -150,7 +150,6 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_thumbnailPanel->SetMinSize(wxSize(FromDIP(198), FromDIP(198))); m_thumbnailPanel->SetMaxSize(wxSize(FromDIP(198), FromDIP(198))); m_thumbnailPanel->SetBackgroundColour(*wxWHITE); - m_thumbnailPanel->SetToolTip(_L("If the transparency of the mapping changes, this thumbnail is for reference only.")); m_sizer_thumbnail->Add(m_thumbnailPanel, 0, wxALIGN_CENTER, 0); m_panel_image->SetSizer(m_sizer_thumbnail); m_panel_image->Layout(); diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 682d79a4cf..c73a7af901 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -497,7 +497,6 @@ void SyncAmsInfoDialog::add_two_image_control() m_right_image_button = new wxButton(m_two_image_panel, wxID_ANY, {}, wxDefaultPosition, wxSize(FromDIP(RIGHT_THUMBNAIL_SIZE_WIDTH), FromDIP(RIGHT_THUMBNAIL_SIZE_WIDTH)), wxBORDER_NONE | wxBU_AUTODRAW); - m_right_image_button->SetToolTip(_L("If the transparency of the mapping changes, this thumbnail is for reference only.")); m_right_sizer_thumbnail = create_sizer_thumbnail(m_right_image_button, false); m_two_image_panel_sizer->Add(m_right_sizer_thumbnail, FromDIP(0), wxALIGN_LEFT | wxEXPAND | wxRIGHT | wxTOP | wxBOTTOM, FromDIP(8)); m_two_image_panel->SetSizer(m_two_image_panel_sizer);