Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:51:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac)"

Browse source 
This reverts commit d68a551940.
This commit is contained in:
Philip Rosedale 2013-12-19 10:01:55 -08:00
parent 118b380d3b
commit 77751df992
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/Application.cpp
View file

@ -994,23 +994,12 @@ void Application::keyPressEvent(QKeyEvent* event) {
deleteVoxelUnderCursor(); deleteVoxelUnderCursor();
} }
break; break;
case Qt::Key_Plus: case Qt::Key_Plus:
increaseVoxelSize();
break;
case Qt::Key_Minus:
decreaseVoxelSize();
break;
case QKeySequence::ZoomIn:
break;
_myAvatar.increaseSize(); _myAvatar.increaseSize();
case QKeySequence::ZoomOut:
break; break;
case Qt::Key_Minus:
_myAvatar.decreaseSize(); _myAvatar.decreaseSize();
break;
case Qt::Key_1: case Qt::Key_1:
case Qt::Key_2: case Qt::Key_2:

8
interface/src/Menu.cpp
View file

@ -210,12 +210,12 @@ Menu::Menu() :
addActionToQMenuAndActionHash(toolsMenu, addActionToQMenuAndActionHash(toolsMenu,
MenuOption::DecreaseVoxelSize, MenuOption::DecreaseVoxelSize,
Qt::Key_Minus, QKeySequence::ZoomOut,
appInstance, appInstance,
SLOT(decreaseVoxelSize())); SLOT(decreaseVoxelSize()));
addActionToQMenuAndActionHash(toolsMenu, addActionToQMenuAndActionHash(toolsMenu,
MenuOption::IncreaseVoxelSize, MenuOption::IncreaseVoxelSize,
Qt::Key_Plus, QKeySequence::ZoomIn,
appInstance, appInstance,
SLOT(increaseVoxelSize())); SLOT(increaseVoxelSize()));
addActionToQMenuAndActionHash(toolsMenu, MenuOption::ResetSwatchColors, 0, this, SLOT(resetSwatchColors())); addActionToQMenuAndActionHash(toolsMenu, MenuOption::ResetSwatchColors, 0, this, SLOT(resetSwatchColors()));
@ -237,12 +237,12 @@ Menu::Menu() :
addActionToQMenuAndActionHash(avatarSizeMenu, addActionToQMenuAndActionHash(avatarSizeMenu,
MenuOption::IncreaseAvatarSize, MenuOption::IncreaseAvatarSize,
QKeySequence::ZoomIn, Qt::Key_Plus,
appInstance->getAvatar(), appInstance->getAvatar(),
SLOT(increaseSize())); SLOT(increaseSize()));
addActionToQMenuAndActionHash(avatarSizeMenu, addActionToQMenuAndActionHash(avatarSizeMenu,
MenuOption::DecreaseAvatarSize, MenuOption::DecreaseAvatarSize,
QKeySequence::ZoomOut, Qt::Key_Minus,
appInstance->getAvatar(), appInstance->getAvatar(),
SLOT(decreaseSize())); SLOT(decreaseSize()));
addActionToQMenuAndActionHash(avatarSizeMenu, addActionToQMenuAndActionHash(avatarSizeMenu,