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

#6473 - Update titlebar when opening a project file by double-clicking the file icon

Browse Source
This commit is contained in:
enricoturri1966 2021-05-06 10:11:53 +02:00
parent ee15f00574
commit 123c5af347
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@
#include <exception> #include <exception>
#include <cstdlib> #include <cstdlib>
#include <regex> #include <regex>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
@ -633,8 +634,17 @@ void GUI_App::post_init()
//FIXME this is not strictly correct, as one may pass a print/filament/printer profile here instead of a full config. //FIXME this is not strictly correct, as one may pass a print/filament/printer profile here instead of a full config.
this->mainframe->load_config_file(this->init_params->load_configs.back()); this->mainframe->load_config_file(this->init_params->load_configs.back());
// If loading a 3MF file, the config is loaded from the last one. // If loading a 3MF file, the config is loaded from the last one.
if (! this->init_params->input_files.empty()) if (!this->init_params->input_files.empty()) {
this->plater()->load_files(this->init_params->input_files, true, true); const std::vector<size_t> res = this->plater()->load_files(this->init_params->input_files, true, true);
if (!res.empty() && this->init_params->input_files.size() == 1) {
// Update application titlebar when opening a project file
const std::string& filename = this->init_params->input_files.front();
if (boost::algorithm::iends_with(filename, ".amf") ||
boost::algorithm::iends_with(filename, ".amf.xml") ||
boost::algorithm::iends_with(filename, ".3mf"))
this->plater()->set_project_filename(filename);
}
}
if (! this->init_params->extra_config.empty()) if (! this->init_params->extra_config.empty())
this->mainframe->load_config(this->init_params->extra_config); this->mainframe->load_config(this->init_params->extra_config);
} }

2
src/slic3r/GUI/Plater.cpp
View File

@ -5722,7 +5722,7 @@ wxString Plater::get_project_filename(const wxString& extension) const
void Plater::set_project_filename(const wxString& filename) void Plater::set_project_filename(const wxString& filename)
{ {
return p->set_project_filename(filename); p->set_project_filename(filename);
} }
bool Plater::is_export_gcode_scheduled() const bool Plater::is_export_gcode_scheduled() const