GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-13 18:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3276 from smurfix/upstream2

Browse Source 
Don't show a confirmation dialog when simply saving a preset
This commit is contained in:
Oleksandra Yushchenko 2020-01-21 15:13:12 +01:00 committed by GitHub
commit 1bbee1c5cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/localization/PrusaSlicer.pot
View File

@ -4914,7 +4914,7 @@ msgid "Cannot overwrite an external profile."
msgstr "" msgstr ""
#: src/slic3r/GUI/Tab.cpp:3038 #: src/slic3r/GUI/Tab.cpp:3038
msgid "Preset with name \"%1%\" already exist." msgid "Preset with name \"%1%\" already exists."
msgstr "" msgstr ""
#: src/slic3r/GUI/Tab.cpp:3039 #: src/slic3r/GUI/Tab.cpp:3039

4
src/slic3r/GUI/Tab.cpp
View File

@ -3033,9 +3033,9 @@ void Tab::save_preset(std::string name /*= ""*/)
show_error(this, _(L("Cannot overwrite an external profile."))); show_error(this, _(L("Cannot overwrite an external profile.")));
return; 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()); wxString msg_text = GUI::from_u8((boost::format(_utf8(L("Preset with name \"%1%\" already exists."))) % name).str());
msg_text += "\n" + _(L("Replace?")); msg_text += "\n" + _(L("Replace?"));
wxMessageDialog dialog(nullptr, msg_text, _(L("Warning")), wxICON_WARNING | wxYES | wxNO); wxMessageDialog dialog(nullptr, msg_text, _(L("Warning")), wxICON_WARNING | wxYES | wxNO);