From 5320af6c138b084ea0b1b1a26a757b0b39524c2b Mon Sep 17 00:00:00 2001 From: Matthias Urlichs Date: Wed, 4 Dec 2019 21:12:26 +0100 Subject: [PATCH 1/2] Don't show a confirmation dialog when saving a preset --- src/slic3r/GUI/Tab.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index ee1750c37..bef177edc 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3026,7 +3026,7 @@ void Tab::save_preset(std::string name /*= ""*/) show_error(this, _(L("Cannot overwrite an external profile."))); return; } - if (existing/* && name != preset.name*/) + if (existing && name != preset.name) { wxString msg_text = GUI::from_u8((boost::format(_utf8(L("Preset with name \"%1%\" already exist."))) % name).str()); msg_text += "\n" + _(L("Replace?")); From 688457b2d00f9ae2b5f07c5c6e49dcbf0dc1afa3 Mon Sep 17 00:00:00 2001 From: Matthias Urlichs Date: Wed, 4 Dec 2019 21:13:42 +0100 Subject: [PATCH 2/2] Grammar fix --- resources/localization/PrusaSlicer.pot | 2 +- src/slic3r/GUI/Tab.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/localization/PrusaSlicer.pot b/resources/localization/PrusaSlicer.pot index 1b1e74cba..ee9b565c1 100644 --- a/resources/localization/PrusaSlicer.pot +++ b/resources/localization/PrusaSlicer.pot @@ -4926,7 +4926,7 @@ msgid "Cannot overwrite an external profile." msgstr "" #: src/slic3r/GUI/Tab.cpp:3031 -msgid "Preset with name \"%1%\" already exist." +msgid "Preset with name \"%1%\" already exists." msgstr "" #: src/slic3r/GUI/Tab.cpp:3032 diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index bef177edc..563f8cc66 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3028,7 +3028,7 @@ void Tab::save_preset(std::string name /*= ""*/) } if (existing && name != preset.name) { - wxString msg_text = GUI::from_u8((boost::format(_utf8(L("Preset with name \"%1%\" already exist."))) % name).str()); + wxString msg_text = GUI::from_u8((boost::format(_utf8(L("Preset with name \"%1%\" already exists."))) % name).str()); msg_text += "\n" + _(L("Replace?")); wxMessageDialog dialog(nullptr, msg_text, _(L("Warning")), wxICON_WARNING | wxYES | wxNO);