From 77751df992e32d8688b742010b02dc03d17e7c5a Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Thu, 19 Dec 2013 10:01:55 -0800
Subject: [PATCH] =?UTF-8?q?Revert=20"Switched=20voxel=20size=20(back)=20to?=
 =?UTF-8?q?=20key=20+,-=20because=20ZoomIn=20and=20ZoomOut=20don=E2=80=99t?=
 =?UTF-8?q?=20seem=20to=20trigger=20(at=20least=20on=20my=20mac)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d68a551940fe522797a8f76ac796a88fb535251b.
---
 interface/src/Application.cpp | 15 ++-------------
 interface/src/Menu.cpp        |  8 ++++----
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 45d13b38ce..24cdabe772 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -994,23 +994,12 @@ void Application::keyPressEvent(QKeyEvent* event) {
                     deleteVoxelUnderCursor();
                 }
                 break;
-            
             case Qt::Key_Plus:
-                increaseVoxelSize();
-                break;
-            
-            case Qt::Key_Minus:
-                decreaseVoxelSize();
-                break;
-                
-            case QKeySequence::ZoomIn:
-                break;
                 _myAvatar.increaseSize();
-                
-            case QKeySequence::ZoomOut:
                 break;
+            case Qt::Key_Minus:
                 _myAvatar.decreaseSize();
-
+                break;
 
             case Qt::Key_1:
             case Qt::Key_2:
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index d22847bcd2..98b807fea2 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -210,12 +210,12 @@ Menu::Menu() :
     
     addActionToQMenuAndActionHash(toolsMenu,
                                   MenuOption::DecreaseVoxelSize,
-                                  Qt::Key_Minus,
+                                  QKeySequence::ZoomOut,
                                   appInstance,
                                   SLOT(decreaseVoxelSize()));
     addActionToQMenuAndActionHash(toolsMenu,
                                   MenuOption::IncreaseVoxelSize,
-                                  Qt::Key_Plus,
+                                  QKeySequence::ZoomIn,
                                   appInstance,
                                   SLOT(increaseVoxelSize()));
     addActionToQMenuAndActionHash(toolsMenu, MenuOption::ResetSwatchColors, 0, this, SLOT(resetSwatchColors()));
@@ -237,12 +237,12 @@ Menu::Menu() :
     
     addActionToQMenuAndActionHash(avatarSizeMenu,
                                   MenuOption::IncreaseAvatarSize,
-                                  QKeySequence::ZoomIn,
+                                  Qt::Key_Plus,
                                   appInstance->getAvatar(),
                                   SLOT(increaseSize()));
     addActionToQMenuAndActionHash(avatarSizeMenu,
                                   MenuOption::DecreaseAvatarSize,
-                                  QKeySequence::ZoomOut,
+                                  Qt::Key_Minus,
                                   appInstance->getAvatar(),
                                   SLOT(decreaseSize()));
     addActionToQMenuAndActionHash(avatarSizeMenu,