More dialog out of Menu (Almost there)

Moved into DialogsManager

interface/src/Menu.cpp

@@ -185,8 +185,10 @@ Menu::Menu() {
                                   dialogsManager.data(), SLOT(editAnimations()));
 
     QMenu* toolsMenu = addMenu("Tools");
-    addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor()));
+    addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0,
-    addActionToQMenuAndActionHash(toolsMenu, MenuOption::ScriptEditor,  Qt::ALT | Qt::Key_S, this, SLOT(showScriptEditor()));
+                                  dialogsManager.data(), SLOT(showMetavoxelEditor()));
+    addActionToQMenuAndActionHash(toolsMenu, MenuOption::ScriptEditor,  Qt::ALT | Qt::Key_S,
+                                  dialogsManager.data(), SLOT(showScriptEditor()));
 
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
     QAction* speechRecognizerAction = addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::ControlWithSpeech,
@@ -409,8 +411,8 @@ Menu::Menu() {
         Application::getInstance()->getMetavoxels(), SLOT(refreshVoxelData()));
     addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::RenderSpanners, 0, true);
     addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::RenderDualContourSurfaces, 0, true);
-    addActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::NetworkSimulator, 0, this,
+    addActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::NetworkSimulator, 0,
-        SLOT(showMetavoxelNetworkSimulator()));
+                                  dialogsManager.data(), SLOT(showMetavoxelNetworkSimulator()));
     
     QMenu* handOptionsMenu = developerMenu->addMenu("Hands");
     addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, false);
@@ -1178,27 +1180,6 @@ void Menu::displayNameLocationResponse(const QString& errorString) {
     }    
 }
 
-void Menu::showMetavoxelEditor() {
-    if (!_MetavoxelEditor) {
-        _MetavoxelEditor = new MetavoxelEditor();
-    }
-    _MetavoxelEditor->raise();
-}
-
-void Menu::showMetavoxelNetworkSimulator() {
-    if (!_metavoxelNetworkSimulator) {
-        _metavoxelNetworkSimulator = new MetavoxelNetworkSimulator();
-    }
-    _metavoxelNetworkSimulator->raise();
-}
-
-void Menu::showScriptEditor() {
-    if(!_ScriptEditor || !_ScriptEditor->isVisible()) {
-        _ScriptEditor = new ScriptEditorWindow();
-    }
-    _ScriptEditor->raise();
-}
-
 void Menu::showChat() {
     if (AccountManager::getInstance().isLoggedIn()) {
         QMainWindow* mainWindow = Application::getInstance()->getWindow();

interface/src/Menu.h

@@ -159,9 +159,6 @@ private slots:
     void bumpSettings();
     void changePrivateKey();
     void runTests();
-    void showMetavoxelEditor();
-    void showMetavoxelNetworkSimulator();
-    void showScriptEditor();
     void showChat();
     void toggleChat();
     void audioMuteToggled();
@@ -173,10 +170,6 @@ private:
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
     SpeechRecognizer _speechRecognizer;
 #endif
-
-    QPointer<MetavoxelEditor> _MetavoxelEditor;
-    QPointer<MetavoxelNetworkSimulator> _metavoxelNetworkSimulator;
-    QPointer<ScriptEditorWindow> _ScriptEditor;
     QPointer<ChatWindow> _chatWindow;
     
     QAction* _chatAction = nullptr;

interface/src/ui/DialogsManager.cpp

@@ -20,8 +20,11 @@
 #include "HMDToolsDialog.h"
 #include "LodToolsDialog.h"
 #include "LoginDialog.h"
+#include "MetavoxelEditor.h"
+#include "MetavoxelNetworkSimulator.h"
 #include "OctreeStatsDialog.h"
 #include "PreferencesDialog.h"
+#include "ScriptEditorWindow.h"
 
 #include "DialogsManager.h"
 
@@ -142,6 +145,21 @@ void DialogsManager::hmdToolsClosed() {
     _hmdToolsDialog->hide();
 }
 
+void DialogsManager::showMetavoxelEditor() {
+    maybeCreateDialog(_metavoxelEditor);
+    _metavoxelEditor->raise();
+}
+
+void DialogsManager::showMetavoxelNetworkSimulator() {
+    maybeCreateDialog(_metavoxelNetworkSimulator);
+    _metavoxelNetworkSimulator->raise();
+}
+
+void DialogsManager::showScriptEditor() {
+    maybeCreateDialog(_scriptEditor);
+    _scriptEditor->raise();
+}
+
 
 
 

interface/src/ui/DialogsManager.h

@@ -40,6 +40,9 @@ public slots:
     void bandwidthDetails();
     void lodTools();
     void hmdTools(bool showTools);
+    void showMetavoxelEditor();
+    void showMetavoxelNetworkSimulator();
+    void showScriptEditor();
     
 private slots:
     void toggleToolWindow();
@@ -70,8 +73,11 @@ private:
     QPointer<HMDToolsDialog> _hmdToolsDialog;
     QPointer<LodToolsDialog> _lodToolsDialog;
     QPointer<LoginDialog> _loginDialog;
+    QPointer<MetavoxelEditor> _metavoxelEditor;
+    QPointer<MetavoxelNetworkSimulator> _metavoxelNetworkSimulator;
     QPointer<OctreeStatsDialog> _octreeStatsDialog;
     QPointer<PreferencesDialog> _preferencesDialog;
+    QPointer<ScriptEditorWindow> _scriptEditor;
 };
 
 #endif // hifi_DialogsManager_h

interface/src/ui/MetavoxelEditor.cpp

@@ -50,8 +50,8 @@ enum GridPlane {
 
 const glm::vec2 INVALID_VECTOR(FLT_MAX, FLT_MAX);
 
-MetavoxelEditor::MetavoxelEditor() :
+MetavoxelEditor::MetavoxelEditor(QWidget* parent) :
-    QWidget(Application::getInstance()->getWindow(), Qt::Tool) {
+    QWidget(parent, Qt::Tool) {
     
     setWindowTitle("Metavoxel Editor");
     setAttribute(Qt::WA_DeleteOnClose);

interface/src/ui/MetavoxelEditor.h

@@ -38,7 +38,7 @@ class MetavoxelEditor : public QWidget {
 
 public:
     
-    MetavoxelEditor();
+    MetavoxelEditor(QWidget* parent = nullptr);
 
     QString getSelectedAttribute() const;
     

interface/src/ui/MetavoxelNetworkSimulator.cpp

@@ -20,8 +20,8 @@
 
 const int BYTES_PER_KILOBYTE = 1024;
 
-MetavoxelNetworkSimulator::MetavoxelNetworkSimulator() :
+MetavoxelNetworkSimulator::MetavoxelNetworkSimulator(QWidget* parent) :
-    QWidget(DependencyManager::get<GLCanvas>().data(), Qt::Dialog) {
+    QWidget(parent, Qt::Dialog) {
     
     setWindowTitle("Metavoxel Network Simulator");
     setAttribute(Qt::WA_DeleteOnClose);

interface/src/ui/MetavoxelNetworkSimulator.h

@@ -23,7 +23,7 @@ class MetavoxelNetworkSimulator : public QWidget {
 
 public:
     
-    MetavoxelNetworkSimulator();
+    MetavoxelNetworkSimulator(QWidget* parent = nullptr);
 
 private slots:
 

interface/src/ui/ScriptEditorWindow.cpp

@@ -31,7 +31,8 @@
 #include "FlowLayout.h"
 #include "JSConsole.h"
 
-ScriptEditorWindow::ScriptEditorWindow() :
+ScriptEditorWindow::ScriptEditorWindow(QWidget* parent) :
+    QWidget(parent),
     _ScriptEditorWindowUI(new Ui::ScriptEditorWindow),
     _loadMenu(new QMenu),
     _saveMenu(new QMenu)

interface/src/ui/ScriptEditorWindow.h

@@ -22,7 +22,7 @@ class ScriptEditorWindow : public QWidget {
     Q_OBJECT
 
 public:
-    ScriptEditorWindow();
+    ScriptEditorWindow(QWidget* parent = nullptr);
     ~ScriptEditorWindow();
 
     void terminateCurrentTab();