3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 04:31:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX:fixed input ip dlg cant skip next step when playing liveview

Browse source 
Change-Id: I43c804babfc5e386f1218c9546acbf612d07703c
This commit is contained in:
tao wang 2023-01-18 18:47:56 +08:00 • committed by Lane.Wei
parent 170a24a43f
commit 6948fb7546
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/GUI/GUI_App.cpp
View file

@ -4582,19 +4582,19 @@ bool GUI_App::show_modal_ip_address_enter_dialog(wxString title)
dlg.Bind(EVT_ENTER_IP_ADDRESS, [this, obj](wxCommandEvent& e) { dlg.Bind(EVT_ENTER_IP_ADDRESS, [this, obj](wxCommandEvent& e) {
auto selection_data_arr = wxSplit(e.GetString().ToStdString(), '|'); auto selection_data_arr = wxSplit(e.GetString().ToStdString(), '|');
if (selection_data_arr.size() != 2) return; if (selection_data_arr.size() == 2) {
auto ip_address = selection_data_arr[0];
auto access_code = selection_data_arr[1];
auto ip_address = selection_data_arr[0]; BOOST_LOG_TRIVIAL(info) << "User enter IP address is " << ip_address;
auto access_code = selection_data_arr[1]; if (!ip_address.empty()) {
wxGetApp().app_config->set_str("ip_address", obj->dev_id, ip_address.ToStdString());
wxGetApp().app_config->save();
BOOST_LOG_TRIVIAL(info) << "User enter IP address is " << ip_address; obj->dev_ip = ip_address.ToStdString();
if (!ip_address.empty()) { obj->set_user_access_code(access_code.ToStdString());
wxGetApp().app_config->set_str("ip_address", obj->dev_id, ip_address.ToStdString()); }
wxGetApp().app_config->save(); }
obj->dev_ip = ip_address.ToStdString();
obj->set_user_access_code(access_code.ToStdString());
}
}); });
if (dlg.ShowModal() == wxID_YES) { if (dlg.ShowModal() == wxID_YES) {

1
src/slic3r/GUI/MediaPlayCtrl.cpp
View file

@ -243,6 +243,7 @@ void MediaPlayCtrl::Stop(wxString const &msg)
if (wxGetApp().show_modal_ip_address_enter_dialog(_L("LAN Connection Failed (Failed to start liveview)"))) { if (wxGetApp().show_modal_ip_address_enter_dialog(_L("LAN Connection Failed (Failed to start liveview)"))) {
m_failed_retry = 0; m_failed_retry = 0;
m_next_retry = wxDateTime::Now(); m_next_retry = wxDateTime::Now();
return;
} }
} }
if (m_next_retry.IsValid()) if (m_next_retry.IsValid())

3
src/slic3r/GUI/ReleaseNote.cpp
View file

@ -1044,7 +1044,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow* parent)
Bind(EVT_CLOSE_IPADDRESS_DLG, [this](auto& e) { Bind(EVT_CLOSE_IPADDRESS_DLG, [this](auto& e) {
m_status_bar->reset(); m_status_bar->reset();
this->EndModal(wxID_OK); EndModal(wxID_YES);
}); });
Bind(wxEVT_CLOSE_WINDOW, [this](auto& e) {on_cancel();}); Bind(wxEVT_CLOSE_WINDOW, [this](auto& e) {on_cancel();});
} }
@ -1134,6 +1134,7 @@ void InputIpAddressDialog::on_ok(wxMouseEvent& evt)
auto event_close = wxCommandEvent(EVT_CLOSE_IPADDRESS_DLG); auto event_close = wxCommandEvent(EVT_CLOSE_IPADDRESS_DLG);
event_close.SetEventObject(this); event_close.SetEventObject(this);
wxPostEvent(this, event_close); wxPostEvent(this, event_close);
return;
} }
m_button_ok->Enable(false); m_button_ok->Enable(false);