juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-30 14:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.3' into dev_2.2.3_alves_bug_fix

Browse Source
This commit is contained in:
alves
2026-03-04 10:00:02 +08:00
parent fddb774d4a 706508c792
commit fb9ff36404
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/GUI_App.cpp
View File

@@ -3658,6 +3658,8 @@ if (res) {
load_current_presets(); load_current_presets();
update_publish_status(); update_publish_status();
mainframe->refresh_plugin_tips(); mainframe->refresh_plugin_tips();
m_fltviews.reload_all();
// BBS: remove SLA related message // BBS: remove SLA related message
} }
} catch (std::exception &) { } catch (std::exception &) {
@@ -6727,6 +6729,7 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage
wxGetApp().sidebar().update_nozzle_settings(); wxGetApp().sidebar().update_nozzle_settings();
update_publish_status(); update_publish_status();
mainframe->refresh_plugin_tips(); mainframe->refresh_plugin_tips();
m_fltviews.reload_all();
// BBS: remove SLA related message // BBS: remove SLA related message
} }
auto isAgree = wxGetApp().app_config->get("app", PRIVACY_POLICY_FLAGS); auto isAgree = wxGetApp().app_config->get("app", PRIVACY_POLICY_FLAGS);

2
src/slic3r/GUI/GUI_App.hpp
View File

@@ -903,7 +903,7 @@ public:
} }
} }
void relead_all() { void reload_all() {
for (const auto& view : webviews) { for (const auto& view : webviews) {
auto ptr = view.first; auto ptr = view.first;
wxString new_url = app->get_international_url(view.second); wxString new_url = app->get_international_url(view.second);

6
src/slic3r/GUI/SSWCP.cpp
View File

@@ -1523,7 +1523,11 @@ void SSWCP_Instance::update_filament_info(const json& objects, bool send_message
// 名称特殊处理 // 名称特殊处理
if (type == "TPU") { if (type == "TPU") {
name = vendor + " " + type; if (sub_type == "95A HF") {
name = vendor + " " + type + ((sub_type != "NONE" && sub_type != "") ? " " + sub_type : "");
} else {
name = vendor + " " + type;
}
} else if (sub_type == "Support") { } else if (sub_type == "Support") {
name = vendor + " Support" + " For " + type; name = vendor + " Support" + " For " + type;
} else { } else {

2
src/slic3r/GUI/WebGuideDialog.cpp
View File

@@ -496,7 +496,7 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
} }
} }
wxGetApp().fltviews().relead_all(); wxGetApp().fltviews().reload_all();
} }
this->EndModal(wxID_OK); this->EndModal(wxID_OK);