mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-16 21:42:43 +00:00
Merge branch 'main' into feat/printer-agent-impl
This commit is contained in:
@@ -3431,7 +3431,7 @@ void SelectMachineDialog::show_timelapse_storage_dialog(MachineObject* obj)
|
||||
|
||||
if (show_cleanup_btn) {
|
||||
auto* btn_cleanup = new Button(&dlg, _L("Clean Up"));
|
||||
btn_cleanup->Bind(wxEVT_BUTTON, [&dlg, ID_CLEANUP](wxCommandEvent&) { dlg.EndModal(ID_CLEANUP); });
|
||||
btn_cleanup->Bind(wxEVT_BUTTON, [&dlg](wxCommandEvent&) { dlg.EndModal(ID_CLEANUP); });
|
||||
btn_sizer->Add(btn_cleanup, 0, wxEXPAND);
|
||||
}
|
||||
|
||||
@@ -5527,7 +5527,7 @@ void SelectMachineDialog::reset_and_sync_ams_list()
|
||||
first_enabled_id = extruder;
|
||||
}
|
||||
|
||||
item->Bind(wxEVT_LEFT_UP, [this, item, materials, extruder](wxMouseEvent &e) {});
|
||||
item->Bind(wxEVT_LEFT_UP, [materials](wxMouseEvent &e) {});
|
||||
item->Bind(wxEVT_LEFT_DOWN, [this, item, materials, extruder](wxMouseEvent &e) {
|
||||
if (!item->m_enable) {return;}
|
||||
if (!m_check_flag || m_print_status == PrintDialogStatus::PrintStatusUnsupportedPrinter) { return; } /*STUDIO-11301*/
|
||||
@@ -6158,8 +6158,8 @@ void SelectMachineDialog::set_default_from_sdcard()
|
||||
first_enabled_id = fo.id;
|
||||
}
|
||||
|
||||
item->Bind(wxEVT_LEFT_UP, [this, item, materials](wxMouseEvent& e) {});
|
||||
item->Bind(wxEVT_LEFT_DOWN, [this, obj_, item, materials, diameters_count, fo](wxMouseEvent& e) {
|
||||
item->Bind(wxEVT_LEFT_UP, [materials](wxMouseEvent& e) {});
|
||||
item->Bind(wxEVT_LEFT_DOWN, [this, obj_, item, materials, fo](wxMouseEvent& e) {
|
||||
if (!item->m_enable) {return;}
|
||||
if (!m_check_flag || m_print_status == PrintDialogStatus::PrintStatusUnsupportedPrinter) { return; } /*STUDIO-11301*/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user