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

FIX:fixed multiple prompt windows popping up

Browse source 
Change-Id: I7cfc6d1ce08d356dc9c2f7125b46d4e12b95f4e7
This commit is contained in:
tao wang 2023-06-05 19:57:52 +08:00 • committed by Lane.Wei
parent fc64864b15
commit 1d16e98e06
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/StatusPanel.cpp
View file

@ -1620,8 +1620,13 @@ void StatusPanel::update(MachineObject *obj)
if (iter_connect_type->second == "lan" && obj->dev_connection_type == "cloud") { if (iter_connect_type->second == "lan" && obj->dev_connection_type == "cloud") {
wxString txt = _L("Disconnected from printer [%s] due to LAN mode disabled.Please reconnect the printer by logging in with your user account."); wxString txt = _L("Disconnected from printer [%s] due to LAN mode disabled.Please reconnect the printer by logging in with your user account.");
wxString msg = wxString::Format(txt,obj->dev_name); wxString msg = wxString::Format(txt,obj->dev_name);
if (!m_show_mode_changed) {
m_show_mode_changed = true;
MessageDialog msg_wingow(nullptr, msg, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_wingow(nullptr, msg, wxEmptyString, wxICON_WARNING | wxOK);
msg_wingow.ShowModal(); if (msg_wingow.ShowModal() == wxID_OK || msg_wingow.ShowModal() == wxID_CLOSE) {
m_show_mode_changed = false;
}
}
m_print_connect_types[obj->dev_id] = obj->dev_connection_type; m_print_connect_types[obj->dev_id] = obj->dev_connection_type;
} }
@ -1629,8 +1634,13 @@ void StatusPanel::update(MachineObject *obj)
if (iter_connect_type->second == "cloud" && obj->dev_connection_type == "lan") { if (iter_connect_type->second == "cloud" && obj->dev_connection_type == "lan") {
wxString txt = _L("Disconnected from printer [%s] due to LAN mode enabled.Please reconnect the printer by inputting Access Code which can be gotten from printer screen."); wxString txt = _L("Disconnected from printer [%s] due to LAN mode enabled.Please reconnect the printer by inputting Access Code which can be gotten from printer screen.");
wxString msg = wxString::Format(txt, obj->dev_name); wxString msg = wxString::Format(txt, obj->dev_name);
if (!m_show_mode_changed) {
m_show_mode_changed = true;
MessageDialog msg_wingow(nullptr, msg, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_wingow(nullptr, msg, wxEmptyString, wxICON_WARNING | wxOK);
msg_wingow.ShowModal(); if (msg_wingow.ShowModal() == wxID_OK || msg_wingow.ShowModal() == wxID_CLOSE) {
m_show_mode_changed = false;
}
}
m_print_connect_types[obj->dev_id] = obj->dev_connection_type; m_print_connect_types[obj->dev_id] = obj->dev_connection_type;
} }
} }

2
src/slic3r/GUI/StatusPanel.hpp
View file

@ -303,7 +303,7 @@ protected:
int speed_lvl_timeout {0}; int speed_lvl_timeout {0};
boost::posix_time::ptime speed_dismiss_time; boost::posix_time::ptime speed_dismiss_time;
bool m_showing_speed_popup = false; bool m_showing_speed_popup = false;
bool m_show_mode_changed = false;
std::map<wxString, wxImage> img_list; // key: url, value: wxBitmap png Image std::map<wxString, wxImage> img_list; // key: url, value: wxBitmap png Image
std::map<std::string, std::string> m_print_connect_types; std::map<std::string, std::string> m_print_connect_types;
std::vector<Button *> m_buttons; std::vector<Button *> m_buttons;