Merge pull request #1053 from birarda/master

change goToUser shortcut to @
This commit is contained in:
Philip Rosedale 2013-10-11 17:10:50 -07:00
commit 03bb2c8b19
3 changed files with 5 additions and 2 deletions

View file

@ -908,6 +908,9 @@ void Application::keyPressEvent(QKeyEvent* event) {
case Qt::Key_8:
_swatch.handleEvent(event->key(), Menu::getInstance()->isOptionChecked(MenuOption::VoxelGetColorMode));
break;
case Qt::Key_At:
Menu::getInstance()->goToUser();
break;
default:
event->ignore();
break;

View file

@ -101,7 +101,7 @@ Menu::Menu() :
SLOT(goToLocation()));
addActionToQMenuAndActionHash(fileMenu,
MenuOption::GoToUser,
Qt::CTRL | Qt::SHIFT | Qt::Key_U,
Qt::Key_At,
this,
SLOT(goToUser()));

View file

@ -66,6 +66,7 @@ public slots:
void saveSettings(QSettings* settings = NULL);
void importSettings();
void exportSettings();
void goToUser();
private slots:
void aboutApp();
@ -73,7 +74,6 @@ private slots:
void editPreferences();
void goToDomain();
void goToLocation();
void goToUser();
void bandwidthDetailsClosed();
void voxelStatsDetailsClosed();
void cycleFrustumRenderMode();