3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH:The model mall dialog can be activated

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/Auxiliary.cpp
View file

@ -652,8 +652,8 @@ void AuFolderPanel::update(std::vector<fs::path> paths)
{
clear();
for (auto i = 0; i < paths.size(); i++) {
std::string temp_name = fs::path(paths[i].c_str()).filename().string();
auto name = encode_path(temp_name.c_str());
std::string temp_name = fs::path(paths[i].c_str()).filename().string();
auto name = encode_path(temp_name.c_str());
auto aufile = new AuFile(m_scrolledWindow, paths[i], name, m_type, wxID_ANY);
m_gsizer_content->Add(aufile, 0, wxALL, FromDIP(8));

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);
}
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();
}
}
@ -4995,8 +4999,12 @@ void GUI_App::open_publish_page_dialog()
m_mall_publish_dialog->go_to_mall(url);
}
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();
}
}

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

@ -7408,7 +7408,7 @@ void Plater::import_model_id(const std::string& download_info)
//update filename
if (is_already_exist && vecFiles.size() >= 1) {
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();
}
@ -7494,7 +7494,7 @@ void Plater::import_model_id(const std::string& download_info)
}
// show save new project
p->set_project_filename(filename);
p->set_project_filename(wxString::FromUTF8(filename));
}
else {
wxMessageBox(msg);