History

Brings logging back

vladest committed 8 years ago

Commit 14dfafa1 parent 53350b41 file · +14 −0Browse files

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

Unified · Split

interface/src/Menu.cpp+14−0
@@ -758,6 +758,20 @@ Menu::Menu() { · 757 unmodified lines
758 connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));758 connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));
759#endif759#endif
760 760
761 // Developer > Log...
762 addActionToQMenuAndActionHash(developerMenu, MenuOption::Log, Qt::CTRL | Qt::SHIFT | Qt::Key_L,
763 qApp, SLOT(toggleLogDialog()));
764 auto essLogAction = addActionToQMenuAndActionHash(developerMenu, MenuOption::EntityScriptServerLog, 0,
765 qApp, SLOT(toggleEntityScriptServerLogDialog()));
766 QObject::connect(nodeList.data(), &NodeList::canRezChanged, essLogAction, [essLogAction] {
767 auto nodeList = DependencyManager::get<NodeList>();
768 essLogAction->setEnabled(nodeList->getThisNodeCanRez());
769 });
770 essLogAction->setEnabled(nodeList->getThisNodeCanRez());
771
772 action = addActionToQMenuAndActionHash(developerMenu, "Script Log (HMD friendly)...", Qt::NoButton,
773 qApp, SLOT(showScriptLogs()));
774
761 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::VerboseLogging, 0, false,775 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::VerboseLogging, 0, false,
762 qApp, SLOT(updateVerboseLogging()));776 qApp, SLOT(updateVerboseLogging()));
763 777