History

cleanup menu defaults

ZappoMan committed 12 years ago

Commit de26b951 parent 70213635 files · +19 −21Browse files

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

Unified · Split

interface/src/Menu.cpp+8−8
@@ -297,6 +297,14 @@ Menu::Menu() : · 296 unmodified lines
297 addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::DontFadeOnVoxelServerChanges);297 addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::DontFadeOnVoxelServerChanges);
298 addActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools()));298 addActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools()));
299 299
300 QMenu* voxelProtoOptionsMenu = voxelOptionsMenu->addMenu("Voxel Server Protocol Options");
301
302 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::DisableColorVoxels);
303 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::DisableLowRes);
304 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::DisableDeltaSending);
305 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::EnableOcclusionCulling);
306 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::DestructiveAddVoxel);
307
300 QMenu* cullingOptionsMenu = voxelOptionsMenu->addMenu("Culling Options");308 QMenu* cullingOptionsMenu = voxelOptionsMenu->addMenu("Culling Options");
301 addDisabledActionAndSeparator(cullingOptionsMenu, "Standard Settings");309 addDisabledActionAndSeparator(cullingOptionsMenu, "Standard Settings");
302 addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::OldVoxelCullingMode, 0,310 addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::OldVoxelCullingMode, 0,
@@ -486,14 +494,6 @@ Menu::Menu() : · 183 unmodified lines
486 QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");494 QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");
487 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoAudio);495 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoAudio);
488 496
489 QMenu* voxelProtoOptionsMenu = developerMenu->addMenu("Voxel Server Protocol Options");
490
491 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::SendVoxelColors);
492 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::LowRes);
493 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::DeltaSending);
494 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::OcclusionCulling);
495 addCheckableActionToQMenuAndActionHash(voxelProtoOptionsMenu, MenuOption::DestructiveAddVoxel);
496
497 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::ExtraDebugging);497 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::ExtraDebugging);
498 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel, 498 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
499 Qt::CTRL | Qt::SHIFT | Qt::Key_V, 499 Qt::CTRL | Qt::SHIFT | Qt::Key_V,