History

Merge branch 'master' of https://github.com/highfidelity/hifi

Andrzej Kapolka committed 12 years ago

Commit 39135d32 parents 4265617 2fdb8d913 files · +31 −38Browse files

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

Unified · Split

interface/src/Menu.cpp+1−1
@@ -695,6 +695,7 @@ QAction* Menu::addCheckableActionToQMenuAndActionHash(QMenu* destinationMenu, · 694 unmodified lines
695 QAction::NoRole, menuItemLocation);695 QAction::NoRole, menuItemLocation);
696 action->setCheckable(true);696 action->setCheckable(true);
697 action->setChecked(checked);697 action->setChecked(checked);
698 connect(action, SIGNAL(changed()), Application::getInstance(), SLOT(bumpSettings()));
698 699
699 return action;700 return action;
700}701}
@@ -928,7 +929,6 @@ void Menu::goToLocation() { · 227 unmodified lines
928 QString currentLocation = QString("%1, %2, %3").arg(QString::number(avatarPos.x),929 QString currentLocation = QString("%1, %2, %3").arg(QString::number(avatarPos.x),
929 QString::number(avatarPos.y), QString::number(avatarPos.z));930 QString::number(avatarPos.y), QString::number(avatarPos.z));
930 931
931
932 QInputDialog coordinateDialog(Application::getInstance()->getWindow());932 QInputDialog coordinateDialog(Application::getInstance()->getWindow());
933 coordinateDialog.setWindowTitle("Go to Location");933 coordinateDialog.setWindowTitle("Go to Location");
934 coordinateDialog.setLabelText("Coordinate as x,y,z:");934 coordinateDialog.setLabelText("Coordinate as x,y,z:");

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