3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow-up on 3523bb421f

Browse Source 
(Ongoing uploads while exiting dialog):
Fixed some string conversion issues.
This commit is contained in:
Vojtech Bubnik 2020-12-12 11:26:17 +01:00
parent 0884f4fbf5
commit ccad84fb42
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/GUI_App.cpp
View File

@ -3,6 +3,7 @@
#include "GUI_Init.hpp"
#include "GUI_ObjectList.hpp"
#include "GUI_ObjectManipulation.hpp"
#include "format.hpp"
#include "I18N.hpp"
#include <algorithm>
@ -1719,7 +1720,7 @@ bool GUI_App::check_print_host_queue()
// Show dialog
wxString job_string = wxString();
for (const auto& job : jobs) {
job_string += (boost::format(" %1% : %2% \n") % job.first % job.second).str();
job_string += format_wxstr(" %1% : %2% \n", job.first, job.second);
}
wxString message;
message += _(L("The uploads are still ongoing")) + ":\n\n" + job_string +"\n" + _(L("Stop them and continue anyway?"));

1
src/slic3r/GUI/PrintHostDialogs.cpp
View File

@ -230,6 +230,7 @@ void PrintHostQueueDialog::append_job(const PrintHostJob &job)
fields.push_back(wxVariant(job.upload_data.upload_path.string()));
fields.push_back(wxVariant(""));
job_list->AppendItem(fields, static_cast<wxUIntPtr>(ST_NEW));
// Both strings are UTF-8 encoded.
upload_names.emplace_back(job.printhost->get_host(), job.upload_data.upload_path.string());
}