Showing the changes to interface/src/Menu.cpp (1 of 5 files). Show all
Unified · Split
| @@ -108,6 +108,7 @@ Menu::Menu() : · 107 unmodified lines | ||
| 108 | 108 | addActionToQMenuAndActionHash(editMenu, MenuOption::CutVoxels, Qt::CTRL | Qt::Key_X, appInstance, SLOT(cutVoxels())); |
| 109 | 109 | addActionToQMenuAndActionHash(editMenu, MenuOption::CopyVoxels, Qt::CTRL | Qt::Key_C, appInstance, SLOT(copyVoxels())); |
| 110 | 110 | addActionToQMenuAndActionHash(editMenu, MenuOption::PasteVoxels, Qt::CTRL | Qt::Key_V, appInstance, SLOT(pasteVoxels())); |
| 111 | + addActionToQMenuAndActionHash(editMenu, MenuOption::NudgeVoxels, Qt::CTRL | Qt::Key_N, appInstance, SLOT(nudgeVoxels())); | |
| 111 | 112 | |
| 112 | 113 | addDisabledActionAndSeparator(editMenu, "Physics"); |
| 113 | 114 | addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::Gravity, Qt::SHIFT | Qt::Key_G, true); |
| @@ -132,7 +133,7 @@ Menu::Menu() : · 18 unmodified lines | ||
| 132 | 133 | QAction* colorVoxelMode = addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::VoxelColorMode, Qt::Key_B); |
| 133 | 134 | _voxelModeActionsGroup->addAction(colorVoxelMode); |
| 134 | 135 | |
| 135 | − QAction* nudgeVoxelMode = addCheckableActionToQMenuAndActionHash(voxelMenu, MenuOption::VoxelNudgeMode, Qt::Key_N); | |
| 136 | + QAction* nudgeVoxelMode = addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::VoxelNudgeMode, Qt::Key_N); | |
| 136 | 137 | _voxelModeActionsGroup->addAction(nudgeVoxelMode); |
| 137 | 138 | |
| 138 | 139 | QAction* selectVoxelMode = addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::VoxelSelectMode, Qt::Key_O); |
| @@ -180,12 +181,6 @@ Menu::Menu() : · 41 unmodified lines | ||
| 180 | 181 | appInstance, |
| 181 | 182 | SLOT(setFullscreen(bool))); |
| 182 | 183 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true); |
| 183 | − addActionToQMenuAndActionHash(voxelMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels())); | |
| 184 | − addActionToQMenuAndActionHash(voxelMenu, MenuOption::ImportVoxels, Qt::CTRL | Qt::Key_I, appInstance, SLOT(importVoxels())); | |
| 185 | − addActionToQMenuAndActionHash(voxelMenu, MenuOption::CutVoxels, Qt::CTRL | Qt::Key_X, appInstance, SLOT(cutVoxels())); | |
| 186 | − addActionToQMenuAndActionHash(voxelMenu, MenuOption::CopyVoxels, Qt::CTRL | Qt::Key_C, appInstance, SLOT(copyVoxels())); | |
| 187 | − addActionToQMenuAndActionHash(voxelMenu, MenuOption::PasteVoxels, Qt::CTRL | Qt::Key_V, appInstance, SLOT(pasteVoxels())); | |
| 188 | − addActionToQMenuAndActionHash(voxelMenu, MenuOption::NudgeVoxels, Qt::CTRL | Qt::Key_N, appInstance, SLOT(nudgeVoxels())); | |
| 189 | 184 | |
| 190 | 185 | addActionToQMenuAndActionHash(viewMenu, |
| 191 | 186 | MenuOption::IncreaseAvatarSize, |