diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index cc380d379..8d0a951f4 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -652,8 +652,8 @@ void AuFolderPanel::update(std::vector 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)); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 06b698998..dcb8fc95c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -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(); } } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 4b9a7b8aa..8db16f801 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -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);