From f203cdd682a9104c079493b8babfb141e470c38d Mon Sep 17 00:00:00 2001 From: Shantanu Joshi <82927665+theshantanujoshi@users.noreply.github.com> Date: Thu, 21 May 2026 15:48:52 +0530 Subject: [PATCH] Fix typo 'cancle' -> 'cancel' (#13769) Co-authored-by: Shantanu Joshi --- src/slic3r/GUI/DeviceErrorDialog.cpp | 4 ++-- src/slic3r/GUI/DeviceErrorDialog.hpp | 2 +- src/slic3r/GUI/FilamentMapDialog.cpp | 4 ++-- src/slic3r/GUI/FilamentMapDialog.hpp | 2 +- src/slic3r/GUI/PartSkipDialog.cpp | 4 ++-- src/slic3r/GUI/PartSkipDialog.hpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/DeviceErrorDialog.cpp b/src/slic3r/GUI/DeviceErrorDialog.cpp index 008c99474d..aadc39abd9 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.cpp +++ b/src/slic3r/GUI/DeviceErrorDialog.cpp @@ -175,7 +175,7 @@ void DeviceErrorDialog::init_button_list() init_button(PROBLEM_SOLVED_RESUME, _L("Problem Solved and Resume")); init_button(TURN_OFF_FIRE_ALARM, _L("Got it, Turn off the Fire Alarm.")); init_button(RETRY_PROBLEM_SOLVED, _L("Retry (problem solved)")); - init_button(CANCLE, _L("Cancel")); + init_button(CANCEL, _L("Cancel")); init_button(STOP_DRYING, _L("Stop Drying")); init_button(PROCEED, _L("Proceed")); init_button(DBL_CHECK_CANCEL, _L("Cancel")); @@ -445,7 +445,7 @@ void DeviceErrorDialog::on_button_click(ActionButton btn_id) m_obj->command_ams_control("resume"); break; } - case DeviceErrorDialog::CANCLE: { + case DeviceErrorDialog::CANCEL: { break; } case DeviceErrorDialog::STOP_DRYING: { diff --git a/src/slic3r/GUI/DeviceErrorDialog.hpp b/src/slic3r/GUI/DeviceErrorDialog.hpp index cca8af14c1..af0b850e4b 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.hpp +++ b/src/slic3r/GUI/DeviceErrorDialog.hpp @@ -43,7 +43,7 @@ public: RETRY_PROBLEM_SOLVED = 34, STOP_DRYING = 35, - CANCLE = 37, + CANCEL = 37, REMOVE_CLOSE_BTN = 39, // special case, do not show close button PROCEED = 41, diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp index 73f8041a28..a514494af1 100644 --- a/src/slic3r/GUI/FilamentMapDialog.cpp +++ b/src/slic3r/GUI/FilamentMapDialog.cpp @@ -215,7 +215,7 @@ FilamentMapDialog::FilamentMapDialog(wxWindow *parent, main_sizer->Add(bottom_panel, 0, wxEXPAND); m_ok_btn->Bind(wxEVT_BUTTON, &FilamentMapDialog::on_ok, this); - m_cancel_btn->Bind(wxEVT_BUTTON, &FilamentMapDialog::on_cancle, this); + m_cancel_btn->Bind(wxEVT_BUTTON, &FilamentMapDialog::on_cancel, this); SetEscapeId(wxID_CANCEL); Bind(wxEVT_CHAR_HOOK, [this](wxKeyEvent& e) { if (e.GetKeyCode() == WXK_ESCAPE) { @@ -286,7 +286,7 @@ void FilamentMapDialog::on_ok(wxCommandEvent &event) EndModal(wxID_OK); } -void FilamentMapDialog::on_cancle(wxCommandEvent &event) { EndModal(wxID_CANCEL); } +void FilamentMapDialog::on_cancel(wxCommandEvent &event) { EndModal(wxID_CANCEL); } void FilamentMapDialog::update_panel_status(PageType page) { diff --git a/src/slic3r/GUI/FilamentMapDialog.hpp b/src/slic3r/GUI/FilamentMapDialog.hpp index bafc6ab3f2..3272f203b3 100644 --- a/src/slic3r/GUI/FilamentMapDialog.hpp +++ b/src/slic3r/GUI/FilamentMapDialog.hpp @@ -60,7 +60,7 @@ public: void set_modal_btn_labels(const wxString& left_label, const wxString& right_label); private: void on_ok(wxCommandEvent &event); - void on_cancle(wxCommandEvent &event); + void on_cancel(wxCommandEvent &event); void on_switch_mode(wxCommandEvent &event); void on_checkbox(wxCommandEvent &event); diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp index 12a794cfe2..87d8b714b6 100644 --- a/src/slic3r/GUI/PartSkipDialog.cpp +++ b/src/slic3r/GUI/PartSkipDialog.cpp @@ -824,7 +824,7 @@ bool PartSkipDialog::IsAllChecked() return true; } -bool PartSkipDialog::IsAllCancled() +bool PartSkipDialog::IsAllCanceled() { for (auto &[part_id, part_state] : m_parts_state) { if (part_state == PartState::psChecked) return false; @@ -851,7 +851,7 @@ void PartSkipDialog::OnAllCheckbox(wxCommandEvent &event) void PartSkipDialog::UpdateApplyButtonStatus() { - if (IsAllCancled()) { + if (IsAllCanceled()) { m_apply_btn->SetStyle(ButtonStyle::Regular, ButtonType::Choice); m_apply_btn->SetToolTip(_L("Nothing selected")); m_enable_apply_btn = false; diff --git a/src/slic3r/GUI/PartSkipDialog.hpp b/src/slic3r/GUI/PartSkipDialog.hpp index 4f0b5bf07f..95eba9f24d 100644 --- a/src/slic3r/GUI/PartSkipDialog.hpp +++ b/src/slic3r/GUI/PartSkipDialog.hpp @@ -153,7 +153,7 @@ private: void UpdateDialogUI(); void UpdateApplyButtonStatus(); bool IsAllChecked(); - bool IsAllCancled(); + bool IsAllCanceled(); void OnRetryButton(wxCommandEvent &event); void OnAllCheckbox(wxCommandEvent &event);