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

Fix typo 'cancle' -> 'cancel' (#13769)

Browse Source 
Co-authored-by: Shantanu Joshi <shan@example.com>
This commit is contained in:
Shantanu Joshi
2026-05-21 15:48:52 +05:30
committed by GitHub
parent b81f865784
commit f203cdd682
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@ void DeviceErrorDialog::init_button_list()
init_button(PROBLEM_SOLVED_RESUME, _L("Problem Solved and Resume")); 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(TURN_OFF_FIRE_ALARM, _L("Got it, Turn off the Fire Alarm."));
init_button(RETRY_PROBLEM_SOLVED, _L("Retry (problem solved)")); 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(STOP_DRYING, _L("Stop Drying"));
init_button(PROCEED, _L("Proceed")); init_button(PROCEED, _L("Proceed"));
init_button(DBL_CHECK_CANCEL, _L("Cancel")); 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"); m_obj->command_ams_control("resume");
break; break;
} }
case DeviceErrorDialog::CANCLE: { case DeviceErrorDialog::CANCEL: {
break; break;
} }
case DeviceErrorDialog::STOP_DRYING: { case DeviceErrorDialog::STOP_DRYING: {

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

@@ -43,7 +43,7 @@ public:
RETRY_PROBLEM_SOLVED = 34, RETRY_PROBLEM_SOLVED = 34,
STOP_DRYING = 35, STOP_DRYING = 35,
CANCLE = 37, CANCEL = 37,
REMOVE_CLOSE_BTN = 39, // special case, do not show close button REMOVE_CLOSE_BTN = 39, // special case, do not show close button
PROCEED = 41, PROCEED = 41,

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

@@ -215,7 +215,7 @@ FilamentMapDialog::FilamentMapDialog(wxWindow *parent,
main_sizer->Add(bottom_panel, 0, wxEXPAND); main_sizer->Add(bottom_panel, 0, wxEXPAND);
m_ok_btn->Bind(wxEVT_BUTTON, &FilamentMapDialog::on_ok, this); 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); SetEscapeId(wxID_CANCEL);
Bind(wxEVT_CHAR_HOOK, [this](wxKeyEvent& e) { Bind(wxEVT_CHAR_HOOK, [this](wxKeyEvent& e) {
if (e.GetKeyCode() == WXK_ESCAPE) { if (e.GetKeyCode() == WXK_ESCAPE) {
@@ -286,7 +286,7 @@ void FilamentMapDialog::on_ok(wxCommandEvent &event)
EndModal(wxID_OK); 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) void FilamentMapDialog::update_panel_status(PageType page)
{ {

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

@@ -60,7 +60,7 @@ public:
void set_modal_btn_labels(const wxString& left_label, const wxString& right_label); void set_modal_btn_labels(const wxString& left_label, const wxString& right_label);
private: private:
void on_ok(wxCommandEvent &event); void on_ok(wxCommandEvent &event);
void on_cancle(wxCommandEvent &event); void on_cancel(wxCommandEvent &event);
void on_switch_mode(wxCommandEvent &event); void on_switch_mode(wxCommandEvent &event);
void on_checkbox(wxCommandEvent &event); void on_checkbox(wxCommandEvent &event);

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

@@ -824,7 +824,7 @@ bool PartSkipDialog::IsAllChecked()
return true; return true;
} }
bool PartSkipDialog::IsAllCancled() bool PartSkipDialog::IsAllCanceled()
{ {
for (auto &[part_id, part_state] : m_parts_state) { for (auto &[part_id, part_state] : m_parts_state) {
if (part_state == PartState::psChecked) return false; if (part_state == PartState::psChecked) return false;
@@ -851,7 +851,7 @@ void PartSkipDialog::OnAllCheckbox(wxCommandEvent &event)
void PartSkipDialog::UpdateApplyButtonStatus() void PartSkipDialog::UpdateApplyButtonStatus()
{ {
if (IsAllCancled()) { if (IsAllCanceled()) {
m_apply_btn->SetStyle(ButtonStyle::Regular, ButtonType::Choice); m_apply_btn->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
m_apply_btn->SetToolTip(_L("Nothing selected")); m_apply_btn->SetToolTip(_L("Nothing selected"));
m_enable_apply_btn = false; m_enable_apply_btn = false;

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

@@ -153,7 +153,7 @@ private:
void UpdateDialogUI(); void UpdateDialogUI();
void UpdateApplyButtonStatus(); void UpdateApplyButtonStatus();
bool IsAllChecked(); bool IsAllChecked();
bool IsAllCancled(); bool IsAllCanceled();
void OnRetryButton(wxCommandEvent &event); void OnRetryButton(wxCommandEvent &event);
void OnAllCheckbox(wxCommandEvent &event); void OnAllCheckbox(wxCommandEvent &event);