juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/bbl-network-upd

Browse Source
This commit is contained in:
Noisyfox
2025-06-01 19:33:39 +08:00
committed by GitHub
parent 3d64af917a b8c5ddd0ee
commit 9444d61bb6
59 changed files with 2853 additions and 3014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/UpgradePanel.cpp
View File

@@ -1059,7 +1059,7 @@ void MachineInfoPanel::show_status(int status, std::string upgrade_status_str)
m_staticText_upgrading_percent->Show();
} else if (status == (int) MachineObject::UpgradingDisplayState::UpgradingFinished) {
if (upgrade_status_str == "UPGRADE_FAIL") {
m_staticText_upgrading_info->SetLabel(_L("Updating failed"));
m_staticText_upgrading_info->SetLabel(_L("Update failed"));
m_staticText_upgrading_info->SetForegroundColour(TEXT_FAILED_CLR);
for (size_t i = 0; i < m_upgrading_sizer->GetItemCount(); i++) { m_upgrading_sizer->Show(true); }
m_button_upgrade_firmware->Disable();
@@ -1067,7 +1067,7 @@ void MachineInfoPanel::show_status(int status, std::string upgrade_status_str)
m_staticText_upgrading_percent->Show();
m_upgrade_retry_img->Show();
} else {
m_staticText_upgrading_info->SetLabel(_L("Updating successful"));
m_staticText_upgrading_info->SetLabel(_L("Update successful"));
m_staticText_upgrading_info->Show();
for (size_t i = 0; i < m_upgrading_sizer->GetItemCount(); i++) { m_upgrading_sizer->Show(true); }
m_button_upgrade_firmware->Disable();