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

Wayne Chen committed 8 years ago

Commit c85b8402 parents 6707bf5 76d2519360 files · +6488 −3872Browse files

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

Unified · Split

interface/src/Menu.cpp+8−0

@@ -228,6 +228,14 @@ Menu::Menu() { · 227 unmodified lines
228	228	addActionToQMenuAndActionHash(navigateMenu, MenuOption::CopyPath, 0,
229	229	addressManager.data(), SLOT(copyPath()));
230	230
	231	+ // Navigate > Start-up Location
	232	+ MenuWrapper* startupLocationMenu = navigateMenu->addMenu(MenuOption::StartUpLocation);
	233	+ QActionGroup* startupLocatiopnGroup = new QActionGroup(startupLocationMenu);
	234	+ startupLocatiopnGroup->setExclusive(true);
	235	+ startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0,
	236	+ false));
	237	+ startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0,
	238	+ true));
231	239
232	240	// Settings menu ----------------------------------
233	241	MenuWrapper* settingsMenu = addMenu("Settings");