3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into dk_remote_devices

Browse source
This commit is contained in:
David Kocik 2019-12-19 08:58:11 +01:00
commit 3a54279cec
21 changed files with 312 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/Plater.cpp
View file

@ -3271,7 +3271,13 @@ void Plater::priv::reload_from_disk()
{
// ask user to select the missing file
std::string search = missing_input_paths.back().string();
wxFileDialog dialog(q, _(L("Please select the file to reload:")), "", from_u8(fs::path(search).filename().string()), file_wildcards(FT_MODEL), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
wxString title = _(L("Please select the file to reload"));
#if defined(__APPLE__)
title += " (" + from_u8(fs::path(search).filename().string()) + "):";
#else
title += ":";
#endif // __APPLE__
wxFileDialog dialog(q, title, "", from_u8(fs::path(search).filename().string()), file_wildcards(FT_MODEL), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (dialog.ShowModal() != wxID_OK)
return;