History

merge upstream/master into andrew/ragdoll

Andrew Meadows committed 12 years ago

Commit 8359e672 parents cefe8e0 fe9ae5b57 files · +1332 −509Browse files

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

Unified · Split

interface/src/Application.cpp+10−0
@@ -288,6 +288,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 287 unmodified lines
288288 // set the account manager's root URL and trigger a login request if we don't have the access token
289289 accountManager.setAuthURL(DEFAULT_NODE_AUTH_URL);
290290 UserActivityLogger::getInstance().launch(applicationVersion());
291+
292+ // grab the location manager instance early so it lives in our thread
293+ LocationManager::getInstance();
291294
292295 // once the event loop has started, check and signal for an access token
293296 QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection);
@@ -927,6 +930,13 @@ void Application::keyPressEvent(QKeyEvent* event) { · 633 unmodified lines
927930 }
928931
929932 break;
933+
934+ case Qt::Key_N:
935+ if (isMeta) {
936+ Menu::getInstance()->triggerOption(MenuOption::NameLocation);
937+ }
938+
939+ break;
930940
931941 case Qt::Key_Up:
932942 if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t