amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX:Fixed the issue of disconnection cause no respon

Browse source 
jira:[STUDIO-8062]

Change-Id: Ic369f6f6b293c0f616e6408651c6f40cec0de051
(cherry picked from commit c3bb86f26c399d19b00de321d490e0586a1e10f7)
This commit is contained in:
tao wang 2024-09-10 21:47:10 +08:00 committed by Noisyfox
parent b75f22bb22
commit 02abd177b5
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1557,7 +1557,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow* parent)
m_button_ok->Bind(wxEVT_LEFT_DOWN, &InputIpAddressDialog::on_ok, this); m_button_ok->Bind(wxEVT_LEFT_DOWN, &InputIpAddressDialog::on_ok, this);
auto m_button_cancel = new Button(this, _L("Close")); /*auto m_button_cancel = new Button(this, _L("Close"));
m_button_cancel->SetBackgroundColor(btn_bg_white); m_button_cancel->SetBackgroundColor(btn_bg_white);
m_button_cancel->SetBorderColor(wxColour(38, 46, 48)); m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
m_button_cancel->SetFont(Label::Body_12); m_button_cancel->SetFont(Label::Body_12);
@ -1567,11 +1567,11 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow* parent)
m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
on_cancel(); on_cancel();
}); });*/
m_sizer_button->AddStretchSpacer(); m_sizer_button->AddStretchSpacer();
m_sizer_button->Add(m_button_ok, 0, wxALL, FromDIP(5)); m_sizer_button->Add(m_button_ok, 0, wxALL, FromDIP(5));
m_sizer_button->Add(m_button_cancel, 0, wxALL, FromDIP(5)); //m_sizer_button->Add(m_button_cancel, 0, wxALL, FromDIP(5));
m_sizer_button->Layout(); m_sizer_button->Layout();
@ -1704,7 +1704,7 @@ void InputIpAddressDialog::on_cancel()
{ {
if (m_thread) { if (m_thread) {
m_thread->interrupt(); m_thread->interrupt();
m_thread->join(); m_thread->detach();
delete m_thread; delete m_thread;
m_thread = nullptr; m_thread = nullptr;
} }
@ -1842,6 +1842,16 @@ void InputIpAddressDialog::workerThreadFunc(std::string str_ip, std::string str_
else if (result == -3) { else if (result == -3) {
update_test_msg(_L("The device does not support using IP and Access Code for connection."), false); update_test_msg(_L("The device does not support using IP and Access Code for connection."), false);
} }
m_button_ok->Enable(true);
m_button_ok->Enable(true);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered),
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
m_button_ok->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
m_button_ok->SetBackgroundColor(btn_bg_green);
m_button_ok->SetBorderColor(*wxWHITE);
Layout(); Layout();
Fit(); Fit();
return; return;
@ -1871,20 +1881,23 @@ void InputIpAddressDialog::workerThreadFunc(std::string str_ip, std::string str_
} }
closeCount = 3; closeCount = 1;
update_test_msg(wxEmptyString, true); update_test_msg(wxEmptyString, true);
update_test_msg(wxString::Format(_L("Printer binding successful. The dialog will close in %d seconds"), closeCount), true); update_test_msg(wxString::Format(_L("Printer binding successful. The dialog will close later"), closeCount), true);
closeTimer->Start(1000); closeTimer->Start(1000);
Layout(); Layout();
Fit(); Fit();
Refresh(true);
} }
void InputIpAddressDialog::OnTimer(wxTimerEvent& event) { void InputIpAddressDialog::OnTimer(wxTimerEvent& event) {
if (closeCount > 0) { if (closeCount > 0) {
closeCount--; closeCount--;
update_test_msg(wxString::Format(_L("Printer binding successful. The dialog will close in %d seconds"), closeCount), true); //update_test_msg(wxString::Format(_L("Printer binding successful. The dialog will close in %d seconds"), closeCount), true);
Refresh(); //Refresh();
} }
else { else {
closeTimer->Stop(); closeTimer->Stop();