Showing the changes to interface/src/Application.cpp (1 of 57 files). Show all
Unified · Split
| @@ -288,6 +288,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 287 unmodified lines | |||
| 288 | // set the account manager's root URL and trigger a login request if we don't have the access token | 288 | // set the account manager's root URL and trigger a login request if we don't have the access token |
| 289 | accountManager.setAuthURL(DEFAULT_NODE_AUTH_URL); | 289 | accountManager.setAuthURL(DEFAULT_NODE_AUTH_URL); |
| 290 | UserActivityLogger::getInstance().launch(applicationVersion()); | 290 | UserActivityLogger::getInstance().launch(applicationVersion()); |
| 291 | |||
| 292 | // grab the location manager instance early so it lives in our thread | ||
| 293 | LocationManager::getInstance(); | ||
| 291 | 294 | ||
| 292 | // once the event loop has started, check and signal for an access token | 295 | // once the event loop has started, check and signal for an access token |
| 293 | QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection); | 296 | QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection); |
| @@ -927,6 +930,13 @@ void Application::keyPressEvent(QKeyEvent* event) { · 633 unmodified lines | |||
| 927 | } | 930 | } |
| 928 | 931 | ||
| 929 | break; | 932 | break; |
| 933 | |||
| 934 | case Qt::Key_N: | ||
| 935 | if (isMeta) { | ||
| 936 | Menu::getInstance()->triggerOption(MenuOption::NameLocation); | ||
| 937 | } | ||
| 938 | |||
| 939 | break; | ||
| 930 | 940 | ||
| 931 | case Qt::Key_Up: | 941 | case Qt::Key_Up: |
| 932 | if (_myCamera.getMode() == CAMERA_MODE_MIRROR) { | 942 | if (_myCamera.getMode() == CAMERA_MODE_MIRROR) { |