diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index e8905b2f87..41745e843c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2448,7 +2448,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu) // TODO: for when we're able to flash dictionaries // local_menu->Append(config_id_base + FirmwareMenuDict, _L("Flash Language File"), _L("Upload a language dictionary file into a Prusa printer")); } - local_menu->Append(config_id_base + ConfigMenuWifiConfigFile, _L("Wi-Fi Configuration File"), _L("Generate a file to be loaded by a Prusa printer to configure a Wi-Fi connection.")); + local_menu->Append(config_id_base + ConfigMenuWifiConfigFile, _L("Wi-Fi Configuration File"), _L("Generate a file to be loaded by a Prusa printer to configure its Wi-Fi connection.")); local_menu->Bind(wxEVT_MENU, [this, config_id_base](wxEvent &event) { switch (event.GetId() - config_id_base) { diff --git a/src/slic3r/GUI/WifiConfigDialog.cpp b/src/slic3r/GUI/WifiConfigDialog.cpp index 70b5009c7d..f26aed45b2 100644 --- a/src/slic3r/GUI/WifiConfigDialog.cpp +++ b/src/slic3r/GUI/WifiConfigDialog.cpp @@ -28,6 +28,15 @@ WifiConfigDialog::WifiConfigDialog(wxWindow* parent, std::string& file_path, Rem wxBoxSizer* vsizer = new wxBoxSizer(wxVERTICAL); panel->SetSizer(vsizer); + // TRN Wifi config dialog explanation line 1. + wxStaticText* explain_label1 = new wxStaticText(panel, wxID_ANY, _L("Generate a file to be loaded by a Prusa printer to configure its Wi-Fi connection.")); + // TRN Wifi config dialog explanation line 2. + wxStaticText* explain_label2 = new wxStaticText(panel, wxID_ANY, _L("Write this file on a USB flash drive. Its name will be prusa_printer_settings.ini.")); + // TRN Wifi config dialog explanation line 3. + wxStaticText* explain_label3 = new wxStaticText(panel, wxID_ANY, _L("Your Prusa Printer should load this file automatically.")); + // TRN Wifi config dialog explanation line 4. + wxStaticText* explain_label4 = new wxStaticText(panel, wxID_ANY, _L("Note: This file will contains SSID and password in plain text.")); + auto* ssid_sizer = new wxBoxSizer(wxHORIZONTAL); // TRN SSID of WiFi network. wxStaticText* ssid_label = new wxStaticText(panel, wxID_ANY, GUI::format_wxstr("%1%:", _L("SSID"))); @@ -81,6 +90,10 @@ WifiConfigDialog::WifiConfigDialog(wxWindow* parent, std::string& file_path, Rem grid->Add(drive_label, 0, wxALIGN_CENTER_VERTICAL); grid->Add(drive_sizer, 0, wxEXPAND); + vsizer->Add(explain_label1, 0, wxALIGN_CENTER_VERTICAL); + vsizer->Add(explain_label2, 0, wxALIGN_CENTER_VERTICAL); + vsizer->Add(explain_label3, 0, wxALIGN_CENTER_VERTICAL); + vsizer->Add(explain_label4, 0, wxALIGN_CENTER_VERTICAL); vsizer->Add(grid, 0, wxEXPAND | wxTOP | wxBOTTOM, 15); wxBoxSizer* buttons_sizer = new wxBoxSizer(wxHORIZONTAL); diff --git a/src/slic3r/Utils/WifiScanner.cpp b/src/slic3r/Utils/WifiScanner.cpp index 3282784afb..be5f6d5f33 100644 --- a/src/slic3r/Utils/WifiScanner.cpp +++ b/src/slic3r/Utils/WifiScanner.cpp @@ -144,7 +144,6 @@ void fill_wifi_map(Slic3r::WifiSsidPskMap& wifi_map, std::string& connected_ssid wxString xml(xmlstr); boost::property_tree::ptree pt; std::stringstream ss(boost::nowide::narrow(xml)); - BOOST_LOG_TRIVIAL(error) << ss.str(); boost::property_tree::read_xml(ss, pt); std::string password; std::string psk_protected;