juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: support UTF-8 search for devices

Browse Source 
jira: [none]
Change-Id: I29c6509c0d06f238f0d42d0c5422fb0686a598ca
(cherry picked from commit bc96302f12b1435cb8417f87dc09a829271821a8)
This commit is contained in:
xin.zhang
2025-01-21 09:51:25 +08:00
committed by Noisyfox
parent e4f3738f2a
commit 16f0b7890c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/SelectMachinePop.cpp
View File

@@ -769,15 +769,19 @@ void SelectMachinePopup::update_user_devices()
bool SelectMachinePopup::search_for_printer(MachineObject* obj) bool SelectMachinePopup::search_for_printer(MachineObject* obj)
{ {
std::string search_text = std::string((m_search_bar->GetValue()).mb_str()); const std::string& search_text = m_search_bar->GetValue().ToStdString();
if (search_text.empty()) { if (search_text.empty()) {
return true; return true;
} }
auto name = obj->dev_name;
auto ip = obj->dev_ip; const auto& name = wxString::FromUTF8(obj->dev_name).ToStdString();
auto name_it = name.find(search_text); const auto& name_it = name.find(search_text);
auto ip_it = ip.find(search_text); if (name_it != std::string::npos) {
if ((name_it != std::string::npos)||(ip_it != std::string::npos)) { return true;
}
const auto& ip_it = obj->dev_ip.find(search_text);
if (ip_it != std::string::npos) {
return true; return true;
} }