From 0c72adf86738c110ba14917e1290c21fb11582e1 Mon Sep 17 00:00:00 2001 From: David Kocik Date: Mon, 30 Jan 2023 16:00:08 +0100 Subject: [PATCH] UI changes App Updater - filename in notification Downloader - if error text is missing, use message body --- src/slic3r/GUI/DownloaderFileGet.cpp | 5 ++++- src/slic3r/GUI/GUI_App.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/DownloaderFileGet.cpp b/src/slic3r/GUI/DownloaderFileGet.cpp index b30c1a2371..0a1e7ce251 100644 --- a/src/slic3r/GUI/DownloaderFileGet.cpp +++ b/src/slic3r/GUI/DownloaderFileGet.cpp @@ -253,7 +253,10 @@ void FileGet::priv::get_perform() if (file != NULL) fclose(file); wxCommandEvent* evt = new wxCommandEvent(EVT_DWNLDR_FILE_ERROR); - evt->SetString(GUI::from_u8(error)); + if (!error.empty()) + evt->SetString(GUI::from_u8(error)); + else + evt->SetString(GUI::from_u8(body)); evt->SetInt(m_id); m_evt_handler->QueueEvent(evt); }) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index c1490342ca..7312297b73 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3403,7 +3403,7 @@ void GUI_App::app_updater(bool from_user) } app_data.target_path =dwnld_dlg.get_download_path(); // 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(); m_app_updater->set_app_data(std::move(app_data)); m_app_updater->sync_download();