make HMD tools a checkable menu

ZappoMan committed 11 years ago

Commit aa449061 parent 333f3232 files · +18 −8Browse files

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

Unified · Split

                                             appInstance, SLOT(cameraMenuChanged()));
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::UserInterface, Qt::Key_Slash, true);
-    addActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, 0, this, SLOT(hmdTools()));
+    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools, Qt::META | Qt::Key_H,
+                                           false,
+                                           this,
+                                           SLOT(hmdTools(bool)));
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::EnableVRMode, 0,
                                            false,
                                            appInstance,
     }
 }
-void Menu::hmdTools() {
+void Menu::hmdTools(bool showTools) {
-    if (!_hmdToolsDialog) {
+    if (showTools) {
-        _hmdToolsDialog = new HMDToolsDialog(Application::getInstance()->getGLWidget());
+        if (!_hmdToolsDialog) {
-        connect(_hmdToolsDialog, SIGNAL(closed()), SLOT(hmdToolsClosed()));
+            _hmdToolsDialog = new HMDToolsDialog(Application::getInstance()->getGLWidget());
-        _hmdToolsDialog->show();
+            connect(_hmdToolsDialog, SIGNAL(closed()), SLOT(hmdToolsClosed()));
+            _hmdToolsDialog->show();
+        }
+        _hmdToolsDialog->raise();
+    } else {
+        hmdToolsClosed();
     }
-    _hmdToolsDialog->raise();
+    Application::getInstance()->getWindow()->activateWindow();
 }
 void Menu::hmdToolsClosed() {