Merge pull request #1530 from kordero/19485

Code Review for Job #19485
This commit is contained in:
Stephen Birarda 2014-01-15 10:55:47 -08:00
commit 602060525b
2 changed files with 4 additions and 1 deletions

View file

@ -1004,6 +1004,9 @@ void Application::keyPressEvent(QKeyEvent* event) {
case Qt::Key_Minus:
_myAvatar.decreaseSize();
break;
case Qt::Key_Equal:
_myAvatar.resetSize();
break;
case Qt::Key_1:
case Qt::Key_2:

View file

@ -249,7 +249,7 @@ Menu::Menu() :
SLOT(decreaseSize()));
addActionToQMenuAndActionHash(avatarSizeMenu,
MenuOption::ResetAvatarSize,
0,
Qt::Key_Equal,
appInstance->getAvatar(),
SLOT(resetSize()));