diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 3375a282b..45f04b1df 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -59,12 +59,4 @@ #define ENABLE_SVG_ICONS (1 && ENABLE_1_42_0_ALPHA8 && ENABLE_TEXTURES_FROM_SVG) -//==================== -// 1.42.0.rc techs -//==================== -#define ENABLE_1_42_0_RC 1 - -// Disables Edit->Deselect all item menu item -#define DISABLE_DESELECT_ALL_MENU_ITEM (1 && ENABLE_1_42_0_RC) - #endif // _technologies_h_ diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 25f05a728..6091f10a1 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -487,11 +487,9 @@ void MainFrame::init_menubar() append_menu_item(editMenu, wxID_ANY, _(L("&Select all")) + sep + GUI::shortkey_ctrl_prefix() + sep_space + "A", _(L("Selects all objects")), [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->select_all(); }, "", nullptr, [this](){return can_select(); }, this); -#if !DISABLE_DESELECT_ALL_MENU_ITEM - append_menu_item(editMenu, wxID_ANY, _(L("D&eselect all")) + sep + GUI::shortkey_ctrl_prefix() + sep + "Esc", + append_menu_item(editMenu, wxID_ANY, _(L("D&eselect all")) + sep + "Esc", _(L("Deselects all objects")), [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->deselect_all(); }, "", nullptr, [this](){return can_deselect(); }, this); -#endif // !DISABLE_DESELECT_ALL_MENU_ITEM editMenu->AppendSeparator(); append_menu_item(editMenu, wxID_ANY, _(L("&Delete selected")) + sep + hotkey_delete, _(L("Deletes the current selection")),[this](wxCommandEvent&) { m_plater->remove_selected(); },