diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index c61607a0c1..82ed0e3813 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -11,6 +11,7 @@ #include "Downloader.hpp" #include #include +#include #include // Localization headers: include libslic3r version first so everything in this file @@ -4849,20 +4850,39 @@ void GUI_App::on_http_error(wxCommandEvent &evt) return; } - static bool m_show_api_error = false; + // No need to show dialog for 410: 410 means resource has been deleted from the server. + if (status == 410) { + BOOST_LOG_TRIVIAL(info) << "Http error 410."; + return; + } + + static bool m_is_error_shown = false; // Show general error notification for Orca Cloud API failures (not Bambu) if (provider == ORCA_CLOUD_PROVIDER && status >= 400 && code != HttpErrorVersionLimited) { - if (m_show_api_error) - return; - m_show_api_error = true; - wxString msg; if (!error.empty()) { msg = wxString::Format(_L("API error (HTTP %u): %s"), status, wxString::FromUTF8(error)); } else { msg = wxString::Format(_L("API error (HTTP %u)"), status); } - wxMessageBox(msg, _L("Orca Cloud API Error"), wxOK | wxICON_ERROR, wxGetApp().mainframe); + + if (app_config->get_bool("developer_mode")) { + // Use notification manager if ImGui is ready; fall back to wxMessageBox on Linux + // where ImGui may not be initialized until the user switches to the Prepare tab. + if (wxGetApp().plater() != nullptr && wxGetApp().imgui()->display_initialized()) { + wxGetApp() + .plater() + ->get_notification_manager() + ->push_notification(NotificationType::PlaterError, NotificationManager::NotificationLevel::WarningNotificationLevel, + msg.ToUTF8().data()); + } + return; + } + + if (!m_is_error_shown) { + m_is_error_shown = true; + wxMessageBox(msg, _L("Orca Cloud API Error"), wxOK | wxICON_ERROR, wxGetApp().mainframe); + } } } diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp index 8855a38405..af92140379 100644 --- a/src/slic3r/GUI/ImGuiWrapper.hpp +++ b/src/slic3r/GUI/ImGuiWrapper.hpp @@ -373,12 +373,13 @@ public: //BBS static int TOOLBAR_WINDOW_FLAGS; + bool display_initialized() const; + private: void init_font(bool compress); void init_input(); void init_style(); void render_draw_data(ImDrawData *draw_data); - bool display_initialized() const; void destroy_font(); std::vector load_svg(const std::string& bitmap_name, unsigned target_width, unsigned target_height, unsigned *outwidth, unsigned *outheight);