Showing the changes to interface/src/Menu.cpp (1 of 2 files). Show all
Unified · Split
| @@ -335,7 +335,12 @@ Menu::Menu() : · 334 unmodified lines | ||
| 335 | 335 | appInstance, SLOT(cameraMenuChanged())); |
| 336 | 336 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::UserInterface, Qt::Key_Slash, true); |
| 337 | 337 | |
| 338 | − addActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, 0, this, SLOT(hmdTools())); | |
| 338 | + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, Qt::META | Qt::Key_H, | |
| 339 | + false, | |
| 340 | + this, | |
| 341 | + SLOT(hmdTools(bool))); | |
| 342 | + | |
| 343 | + | |
| 339 | 344 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::EnableVRMode, 0, |
| 340 | 345 | false, |
| 341 | 346 | appInstance, |
| @@ -1596,13 +1601,18 @@ void Menu::lodToolsClosed() { · 1254 unmodified lines | ||
| 1596 | 1601 | } |
| 1597 | 1602 | } |
| 1598 | 1603 | |
| 1599 | −void Menu::hmdTools() { | |
| 1600 | − if (!_hmdToolsDialog) { | |
| 1601 | − _hmdToolsDialog = new HMDToolsDialog(Application::getInstance()->getGLWidget()); | |
| 1602 | − connect(_hmdToolsDialog, SIGNAL(closed()), SLOT(hmdToolsClosed())); | |
| 1603 | − _hmdToolsDialog->show(); | |
| 1604 | +void Menu::hmdTools(bool showTools) { | |
| 1605 | + if (showTools) { | |
| 1606 | + if (!_hmdToolsDialog) { | |
| 1607 | + _hmdToolsDialog = new HMDToolsDialog(Application::getInstance()->getGLWidget()); | |
| 1608 | + connect(_hmdToolsDialog, SIGNAL(closed()), SLOT(hmdToolsClosed())); | |
| 1609 | + _hmdToolsDialog->show(); | |
| 1610 | + } | |
| 1611 | + _hmdToolsDialog->raise(); | |
| 1612 | + } else { | |
| 1613 | + hmdToolsClosed(); | |
| 1604 | 1614 | } |
| 1605 | − _hmdToolsDialog->raise(); | |
| 1615 | + Application::getInstance()->getWindow()->activateWindow(); | |
| 1606 | 1616 | } |
| 1607 | 1617 | |
| 1608 | 1618 | void Menu::hmdToolsClosed() { |