diff --git a/src/slic3r/GUI/DownloadProgressDialog.cpp b/src/slic3r/GUI/DownloadProgressDialog.cpp index 39cbb2798..00b7463be 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.cpp +++ b/src/slic3r/GUI/DownloadProgressDialog.cpp @@ -148,11 +148,12 @@ bool DownloadProgressDialog::Show(bool show) m_upgrade_job->set_event_handle(this); m_status_bar->set_progress(0); Bind(EVT_UPGRADE_NETWORK_SUCCESS, [this](wxCommandEvent& evt) { - m_status_bar->change_button_label(_L("Close")); + m_status_bar->change_button_label(_L("OK")); on_finish(); m_status_bar->set_cancel_callback_fina( [this]() { this->Close(); + wxGetApp().request_login(); } ); }); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 70090c60f..8cf38ca3f 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1033,6 +1033,19 @@ void MainFrame::init_tabpanel() wxCommandEvent* evt = new wxCommandEvent(EVT_INSTALL_PLUGIN_HINT); wxQueueEvent(m_plater, evt); } + if (m_confirm_download_plugin_dlg == nullptr){ + m_confirm_download_plugin_dlg = new SecondaryCheckDialog(this, wxID_ANY, _L("Install network plug-in"), SecondaryCheckDialog::ButtonStyle::ONLY_CONFIRM); + m_confirm_download_plugin_dlg->SetSize(wxSize(FromDIP(270), FromDIP(158))); + m_confirm_download_plugin_dlg->update_text(_L("Please Install network plug-in before log in.")); + m_confirm_download_plugin_dlg->update_btn_label(_L("Install Network Plug-in"), _L("")); + + m_confirm_download_plugin_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent& e) { + this->m_confirm_download_plugin_dlg->Close(); + wxGetApp().ShowDownNetPluginDlg(); + return; + }); + } + m_confirm_download_plugin_dlg->on_show(); } } else { diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 6d8662e13..c45478a6b 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -353,6 +353,7 @@ public: MaxVolumetricSpeed_Test_Dlg *m_vol_test_dlg{nullptr}; VFA_Test_Dlg * m_vfa_test_dlg{nullptr}; Retraction_Test_Dlg * m_retraction_calib_dlg{nullptr}; + SecondaryCheckDialog* m_confirm_download_plugin_dlg{ nullptr }; // BBS. Replace title bar and menu bar with top bar. BBLTopbar* m_topbar{ nullptr };