Merge branch 'master' into menu-updates

vladest committed 8 years ago

Commit be22f492 parents 3296ae0 1e25d4860 files · +1005 −1040Browse files

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

Unified · Split

interface/src/Menu.cpp+3−0

@@ -738,6 +738,9 @@ Menu::Menu() { · 737 unmodified lines
738	connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));	738	connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));
739	#endif	739	#endif
740		740
		741	addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::VerboseLogging, 0, false,
		742	qApp, SLOT(updateVerboseLogging()));
		743
741	#if 0 /// -------------- REMOVED FOR NOW --------------	744	#if 0 /// -------------- REMOVED FOR NOW --------------
742	addDisabledActionAndSeparator(navigateMenu, "History");	745	addDisabledActionAndSeparator(navigateMenu, "History");
743	QAction* backAction = addActionToQMenuAndActionHash(navigateMenu, MenuOption::Back, 0, addressManager.data(), SLOT(goBack()));	746	QAction* backAction = addActionToQMenuAndActionHash(navigateMenu, MenuOption::Back, 0, addressManager.data(), SLOT(goBack()));