History

Dialogbox for import fully functionnal

atlante45 committed 13 years ago

Commit 24531fd1 parent b41575912 files · +270 −81Browse files

Showing the changes to interface/src/Menu.cpp (1 of 12 files). Show all

Unified · Split

interface/src/Menu.cpp+1−6
@@ -233,11 +233,6 @@ Menu::Menu() : · 232 unmodified lines
233 233
234 addActionToQMenuAndActionHash(voxelMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels()));234 addActionToQMenuAndActionHash(voxelMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels()));
235 addActionToQMenuAndActionHash(voxelMenu, MenuOption::ImportVoxels, Qt::CTRL | Qt::Key_I, appInstance, SLOT(importVoxels()));235 addActionToQMenuAndActionHash(voxelMenu, MenuOption::ImportVoxels, Qt::CTRL | Qt::Key_I, appInstance, SLOT(importVoxels()));
236 addActionToQMenuAndActionHash(voxelMenu,
237 MenuOption::ImportVoxelsClipboard,
238 Qt::SHIFT | Qt::CTRL | Qt::Key_I,
239 appInstance,
240 SLOT(importVoxelsToClipboard()));
241 addActionToQMenuAndActionHash(voxelMenu, MenuOption::CutVoxels, Qt::CTRL | Qt::Key_X, appInstance, SLOT(cutVoxels()));236 addActionToQMenuAndActionHash(voxelMenu, MenuOption::CutVoxels, Qt::CTRL | Qt::Key_X, appInstance, SLOT(cutVoxels()));
242 addActionToQMenuAndActionHash(voxelMenu, MenuOption::CopyVoxels, Qt::CTRL | Qt::Key_C, appInstance, SLOT(copyVoxels()));237 addActionToQMenuAndActionHash(voxelMenu, MenuOption::CopyVoxels, Qt::CTRL | Qt::Key_C, appInstance, SLOT(copyVoxels()));
243 addActionToQMenuAndActionHash(voxelMenu, MenuOption::PasteVoxels, Qt::CTRL | Qt::Key_V, appInstance, SLOT(pasteVoxels()));238 addActionToQMenuAndActionHash(voxelMenu, MenuOption::PasteVoxels, Qt::CTRL | Qt::Key_V, appInstance, SLOT(pasteVoxels()));
@@ -776,4 +771,4 @@ void Menu::updateFrustumRenderModeAction() { · 532 unmodified lines
776 frustumRenderModeAction->setText("Render Mode - Keyhole");771 frustumRenderModeAction->setText("Render Mode - Keyhole");
777 break;772 break;
778 }773 }
779}774}