mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW:Add interactive UI for installing network plugins 

jira: none

Change-Id: I6f56e902f2b525bf88657c4f72a39cdfce8e2d78
(cherry picked from commit e92f7bf5a31a4b19dc492a47e3a8256955a73013)
This commit is contained in:
hang.xu 2024-08-21 17:36:20 +08:00 committed by Lane.Wei
parent 28fee5f65a
commit f91bbc4f7c
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
}
);
});

13
src/slic3r/GUI/MainFrame.cpp
View File

@ -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 {

1
src/slic3r/GUI/MainFrame.hpp
View File

@ -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 };