mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:The model mall dialog can be activated 

Change-Id: I19aa551ffc79c4f5c9369331f28adbe7410ccab2
This commit is contained in:
tao wang 2022-11-22 12:36:32 +08:00 committed by Lane.Wei
parent 670641fe7b
commit de8db2a89c
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4978,8 +4978,12 @@ void GUI_App::open_mall_page_dialog()
m_mall_home_dialog->go_to_mall(url); m_mall_home_dialog->go_to_mall(url);
} }
else { else {
m_mall_home_dialog->go_to_mall(url); if (m_mall_home_dialog->IsIconized())
m_mall_home_dialog->Iconize(false);
//m_mall_home_dialog->go_to_mall(url);
} }
m_mall_home_dialog->Raise();
m_mall_home_dialog->Show(); m_mall_home_dialog->Show();
} }
} }
@ -4995,8 +4999,12 @@ void GUI_App::open_publish_page_dialog()
m_mall_publish_dialog->go_to_mall(url); m_mall_publish_dialog->go_to_mall(url);
} }
else { else {
m_mall_publish_dialog->go_to_publish(url); if (m_mall_publish_dialog->IsIconized())
m_mall_publish_dialog->Iconize(false);
//m_mall_publish_dialog->go_to_publish(url);
} }
m_mall_publish_dialog->Raise();
m_mall_publish_dialog->Show(); m_mall_publish_dialog->Show();
} }
} }

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

@ -7408,7 +7408,7 @@ void Plater::import_model_id(const std::string& download_info)
//update filename //update filename
if (is_already_exist && vecFiles.size() >= 1) { if (is_already_exist && vecFiles.size() >= 1) {
wxString extension = fs::path(filename).extension().c_str(); wxString extension = fs::path(filename).extension().c_str();
wxString name = filename.substr(0, filename.length() - extension.length() - 1); wxString name = filename.substr(0, filename.length() - extension.length());
filename = wxString::Format("%s(%d)%s", name, vecFiles.size() + 1, extension).ToStdString(); filename = wxString::Format("%s(%d)%s", name, vecFiles.size() + 1, extension).ToStdString();
} }
@ -7494,7 +7494,7 @@ void Plater::import_model_id(const std::string& download_info)
} }
// show save new project // show save new project
p->set_project_filename(filename); p->set_project_filename(wxString::FromUTF8(filename));
} }
else { else {
wxMessageBox(msg); wxMessageBox(msg);