viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev/p2s-pr

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrePrintChecker.cpp
#	src/slic3r/GUI/StatusPanel.cpp
This commit is contained in:
Noisyfox
2025-11-18 09:17:13 +08:00
parent 5e2a7fbf35 4046e39ff3
commit 760f66d3d7
77 changed files with 1760 additions and 2059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3505,8 +3505,8 @@ void StatusPanel::update_ams_control_state(std::string ams_id, std::string slot_
wxString load_error_info, unload_error_info;
if (obj->is_in_printing() && !obj->can_resume()) {
load_error_info = _L("The printer is busy on other print job");
unload_error_info = _L("The printer is busy on other print job");
load_error_info = _L("The printer is busy with another print job.");
unload_error_info = _L("The printer is busy with another print job.");
} else if (obj->can_resume() && !devPrinterUtil::IsVirtualSlot(ams_id)) {
load_error_info = _L("When printing is paused, filament loading and unloading are only supported for external slots.");
unload_error_info = _L("When printing is paused, filament loading and unloading are only supported for external slots.");
@ -3521,8 +3521,8 @@ void StatusPanel::update_ams_control_state(std::string ams_id, std::string slot_
}
if (in_switch_filament) {
load_error_info = _L("Current extruder is busy changing filament");
unload_error_info = _L("Current extruder is busy changing filament");
load_error_info = _L("Current extruder is busy changing filament.");
unload_error_info = _L("Current extruder is busy changing filament.");
}
if (ams_id.empty() || slot_id.empty()) {
@ -3532,14 +3532,14 @@ void StatusPanel::update_ams_control_state(std::string ams_id, std::string slot_
for (auto ext : obj->GetExtderSystem()->GetExtruders()) {
if (ext.GetSlotNow().ams_id == ams_id && ext.GetSlotNow().slot_id == slot_id)
{
load_error_info = _L("Current slot has already been loaded");
load_error_info = _L("Current slot has already been loaded.");
}
}
} else {
for (auto ext : obj->GetExtderSystem()->GetExtruders()) {
if (ext.GetSlotNow().ams_id == ams_id && ext.GetSlotNow().slot_id == slot_id)
{
load_error_info = _L("Current slot has already been loaded");
load_error_info = _L("Current slot has already been loaded.");
}
}
@ -5004,7 +5004,7 @@ void StatusPanel::on_nozzle_selected(wxCommandEvent &event)
/*Enable switch head while printing is paused STUDIO-9789*/
if ((obj->is_in_printing() && !obj->is_in_printing_pause()) || obj->ams_status_main == AMS_STATUS_MAIN_FILAMENT_CHANGE) {
MessageDialog dlg(nullptr, _L("The printer is busy on other print job"), _L("Error"), wxICON_WARNING | wxOK);
MessageDialog dlg(nullptr, _L("The printer is busy with another print job."), _L("Error"), wxICON_WARNING | wxOK);
dlg.ShowModal();
return;
}