GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 19:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wifi config dialog fixes.

Browse Source 
Return file exists check.
Clear txtcontrol of comboboxes.
This commit is contained in:
David Kocik 2023-11-01 14:57:27 +01:00
parent ac2545fede
commit 9f0bb03570
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/WifiConfigDialog.cpp
View File

@ -166,6 +166,7 @@ void WifiConfigDialog::rescan_drives(const wxString& preffered_drive)
{ {
assert(m_drive_combo && m_removable_manager); assert(m_drive_combo && m_removable_manager);
m_drive_combo->Clear(); m_drive_combo->Clear();
m_drive_combo->GetTextCtrl()->Clear();
std::vector<DriveData> ddata = m_removable_manager->get_drive_list(); std::vector<DriveData> ddata = m_removable_manager->get_drive_list();
for (const auto& data : ddata) { for (const auto& data : ddata) {
wxString item = boost::nowide::widen(data.path); wxString item = boost::nowide::widen(data.path);
@ -190,6 +191,7 @@ void WifiConfigDialog::rescan_networks(bool select)
std::string current = m_wifi_scanner->get_current_ssid(); std::string current = m_wifi_scanner->get_current_ssid();
const auto& map = m_wifi_scanner->get_map(); const auto& map = m_wifi_scanner->get_map();
m_ssid_combo->Clear(); m_ssid_combo->Clear();
m_ssid_combo->GetTextCtrl()->Clear();
for (const auto pair : map) { for (const auto pair : map) {
m_ssid_combo->Append(pair.first); m_ssid_combo->Append(pair.first);
// select ssid of current network (if connected) // select ssid of current network (if connected)
@ -231,17 +233,13 @@ void WifiConfigDialog::on_ok(wxCommandEvent& e)
return; return;
} }
#if 0 // older variant of rewriting previous ini file if (boost::filesystem::exists(file_path)) {
if (boost::filesystem::exists(file_path))
{
wxString msg_text = GUI::format_wxstr("%1% already exists. Do you want to rewrite it?", file_path.string()); wxString msg_text = GUI::format_wxstr("%1% already exists. Do you want to rewrite it?", file_path.string());
WarningDialog dialog(m_parent, msg_text, _L("Warning"), wxYES | wxNO); WarningDialog dialog(m_parent, msg_text, _L("Warning"), wxYES | wxNO);
if (dialog.ShowModal() == wxID_NO) if (dialog.ShowModal() == wxID_NO) {
{
return; return;
} }
} }
#endif
std::string data; std::string data;
namespace pt = boost::property_tree; namespace pt = boost::property_tree;