GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-14 19:11:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI changes

Browse Source 
App Updater - filename in notification
Downloader - if error text is missing, use message body
This commit is contained in:
David Kocik 2023-01-30 16:00:08 +01:00
parent 61cc46fc03
commit 0c72adf867
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,7 +253,10 @@ void FileGet::priv::get_perform()
if (file != NULL) if (file != NULL)
fclose(file); fclose(file);
wxCommandEvent* evt = new wxCommandEvent(EVT_DWNLDR_FILE_ERROR); wxCommandEvent* evt = new wxCommandEvent(EVT_DWNLDR_FILE_ERROR);
if (!error.empty())
evt->SetString(GUI::from_u8(error)); evt->SetString(GUI::from_u8(error));
else
evt->SetString(GUI::from_u8(body));
evt->SetInt(m_id); evt->SetInt(m_id);
m_evt_handler->QueueEvent(evt); m_evt_handler->QueueEvent(evt);
}) })

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

@ -3403,7 +3403,7 @@ void GUI_App::app_updater(bool from_user)
} }
app_data.target_path =dwnld_dlg.get_download_path(); app_data.target_path =dwnld_dlg.get_download_path();
// start download // start download
this->plater_->get_notification_manager()->push_download_progress_notification(_utf8("Download"), std::bind(&AppUpdater::cancel_callback, this->m_app_updater.get())); this->plater_->get_notification_manager()->push_download_progress_notification(GUI::format(_utf8("Downloading %1%"), app_data.target_path.filename().string()), std::bind(&AppUpdater::cancel_callback, this->m_app_updater.get()));
app_data.start_after = dwnld_dlg.run_after_download(); app_data.start_after = dwnld_dlg.run_after_download();
m_app_updater->set_app_data(std::move(app_data)); m_app_updater->set_app_data(std::move(app_data));
m_app_updater->sync_download(); m_app_updater->sync_download();