mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:modify "Delete all" shortcut key 

jira: none
Change-Id: I5c90fc2f2d7e2482bb31527e8aae29089bbb69b1
This commit is contained in:
zhou.xu 2025-02-07 19:31:09 +08:00 committed by lane.wei
parent 2353d0366d
commit 5693d65178
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -3484,17 +3484,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
case '5': { select_view("left"); break; }
case '6': { select_view("right"); break; }
case '7': { select_plate(); break; }
//case WXK_BACK:
//case WXK_DELETE:
#ifdef __APPLE__
case 'd':
case 'D':
#else /* __APPLE__ */
case WXK_CONTROL_D:
#endif /* __APPLE__ */
post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE_ALL));
break;
#ifdef __APPLE__
case 'k':
case 'K':
@ -3506,6 +3495,17 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
default: evt.Skip();
}
} else {
if ((evt.GetModifiers() & shiftMask) != 0) {
switch (keyCode) {
case 'd':
case 'D':
case WXK_CONTROL_D:
post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE_ALL));
return;
}
}
auto obj_list = wxGetApp().obj_list();
switch (keyCode)
{

2
src/slic3r/GUI/KBShortcutsDialog.cpp
View File

@ -251,7 +251,7 @@ void KBShortcutsDialog::fill_shortcuts()
{ctrl + "6", L("Camera Angle - Right side")},
{ctrl + "A", L("Select all objects")},
{ctrl + "D", L("Delete all")},
{L("Shift+D"), L("Delete all")},
{ctrl + "Z", L("Undo")},
{ctrl + "Y", L("Redo")},
{ "M", L("Gizmo move") },

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

@ -2597,7 +2597,7 @@ void MainFrame::init_menubar_as_editor()
_L("Deletes the current selection"),[this](wxCommandEvent&) { m_plater->remove_selected(); },
"menu_remove", nullptr, [this](){return can_delete(); }, this);
//BBS: delete all
append_menu_item(editMenu, wxID_ANY, _L("Delete all") + "\t" + ctrl + "D",
append_menu_item(editMenu, wxID_ANY, _L("Delete all") + "\t" + _L("Shift+") + "D",
_L("Deletes all objects"),[this](wxCommandEvent&) { m_plater->delete_all_objects_from_model(); },
"menu_remove", nullptr, [this](){return can_delete_all(); }, this);
editMenu->AppendSeparator();
@ -2679,7 +2679,7 @@ void MainFrame::init_menubar_as_editor()
"", nullptr, [this](){return can_delete(); }, this);
#endif
//BBS: delete all
append_menu_item(editMenu, wxID_ANY, _L("Delete all") + "\t" + ctrl + "D",
append_menu_item(editMenu, wxID_ANY, _L("Delete all") + "\t" + _L("Shift+") + "D",
_L("Deletes all objects"),[this, handle_key_event](wxCommandEvent&) {
wxKeyEvent e;
e.SetEventType(wxEVT_KEY_DOWN);