History

Merge pull request #13257 from danteruiz/rc68-reload-scripts

adding back reload scripts shortcut and clean up AboutUtil(RC68)

John Conklin II committed 8 years ago

Commit 378e84b2 parents 7c5da84 646b8523 files · +29 −28Browse files

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

Unified · Split

interface/src/Application.cpp+7−1
@@ -3644,7 +3644,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3643 unmodified lines
3644 _keysPressed.insert(event->key());3644 _keysPressed.insert(event->key());
3645 3645
3646 _controllerScriptingInterface->emitKeyPressEvent(event); // send events to any registered scripts3646 _controllerScriptingInterface->emitKeyPressEvent(event); // send events to any registered scripts
3647
3648 // if one of our scripts have asked to capture this event, then stop processing it3647 // if one of our scripts have asked to capture this event, then stop processing it
3649 if (_controllerScriptingInterface->isKeyCaptured(event)) {3648 if (_controllerScriptingInterface->isKeyCaptured(event)) {
3650 return;3649 return;
@@ -3729,6 +3728,13 @@ void Application::keyPressEvent(QKeyEvent* event) { · 78 unmodified lines
3729 }3728 }
3730 break;3729 break;
3731 3730
3731 case Qt::Key_R:
3732 if (isMeta && !event->isAutoRepeat()) {
3733 DependencyManager::get<ScriptEngines>()->reloadAllScripts();
3734 DependencyManager::get<OffscreenUi>()->clearCache();
3735 }
3736 break;
3737
3732 case Qt::Key_Asterisk:3738 case Qt::Key_Asterisk:
3733 Menu::getInstance()->triggerOption(MenuOption::DefaultSkybox);3739 Menu::getInstance()->triggerOption(MenuOption::DefaultSkybox);
3734 break;3740 break;