From 020338b191bda8ba80da6c14a785d98ea76d2c7c Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Fri, 3 Nov 2023 09:51:01 +0800 Subject: [PATCH] FIX: [STUDIO-4935] plate name edit in object list Change-Id: I271fa217281d0c7ceca61166497136628a66681e Jira: STUDIO-4935 --- src/slic3r/GUI/ExtraRenderers.cpp | 3 ++- src/slic3r/GUI/GUI_ObjectList.cpp | 2 +- src/slic3r/GUI/Tab.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp index 4e3577b19..068a46324 100644 --- a/src/slic3r/GUI/ExtraRenderers.cpp +++ b/src/slic3r/GUI/ExtraRenderers.cpp @@ -225,7 +225,8 @@ wxWindow* BitmapTextRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelRec bool BitmapTextRenderer::GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value) { wxTextCtrl* text_editor = wxDynamicCast(ctrl, wxTextCtrl); - if (!text_editor || text_editor->GetValue().IsEmpty()) + auto item = GetView()->GetModel()->GetParent(m_item); + if (!text_editor || (item.IsOk() && text_editor->GetValue().IsEmpty())) return false; m_was_unusable_symbol = Slic3r::GUI::Plater::has_illegal_filename_characters(text_editor->GetValue()); diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 58cfb8b59..666fb668f 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -5584,7 +5584,7 @@ void GUI::ObjectList::OnStartEditing(wxDataViewEvent &event) int plate_idx = node->GetPlateIdx(); if (plate_idx >= 0) { auto plate = wxGetApp().plater()->get_partplate_list().get_plate(plate_idx); - m_objects_model->SetName(plate->get_plate_name(), GetSelection()); + m_objects_model->SetName(from_u8(plate->get_plate_name()), GetSelection()); } } } diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 648df2066..f9b48f036 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -5033,9 +5033,9 @@ void Tab::delete_preset() presets += "\n - " + preset2.name; } if (count > 0) { - msg = _L("Presets inherited by other presets cannot be deleted"); + msg = _L("Presets inherited by other presets can not be deleted!"); msg += "\n"; - msg += _L_PLURAL("The following presets inherits this preset.", + msg += _L_PLURAL("The following presets inherit this preset.", "The following preset inherits this preset.", count); wxString title = from_u8((boost::format(_utf8(L("%1% Preset"))) % action).str()); // action + _(L(" Preset")); MessageDialog(parent(), msg + presets, title, wxOK | wxICON_ERROR).ShowModal();