Improve MDI window management

Author: serhmarch

src/core/gui/core_ui.cpp

@@ -123,13 +123,13 @@ void mbCoreUi::initialize()
     m_ui.dockProject->setWidget(m_projectUi);
 
     connect(m_dataViewManager, &mbCoreDataViewManager::dataViewUiContextMenu, this, &mbCoreUi::contextMenuDataViewUi);
+    connect(m_dataViewManager, &mbCoreDataViewManager::dataViewUiAdd        , this, &mbCoreUi::dataViewWindowAdd    );
+    connect(m_dataViewManager, &mbCoreDataViewManager::dataViewUiRemove     , this, &mbCoreUi::dataViewWindowRemove );
 
     m_ui.actionWindowViewSubWindow->setCheckable(true);
     m_ui.actionWindowViewTabbed->setCheckable(true);
     slotWindowManagerViewModeChanged(m_windowManager->viewMode());
     connect(m_windowManager, &mbCoreWindowManager::viewModeChanged, this, &mbCoreUi::slotWindowManagerViewModeChanged);
-    connect(m_windowManager, &mbCoreWindowManager::dataViewWindowAdded, this, &mbCoreUi::dataViewWindowAdd);
-    connect(m_windowManager, &mbCoreWindowManager::dataViewWindowRemoving, this, &mbCoreUi::dataViewWindowRemove);
     this->setCentralWidget(m_windowManager->centralWidget());
 
     // Menu File

src/core/gui/core_windowmanager.cpp

@@ -22,6 +22,7 @@
 */
 #include "core_windowmanager.h"
 
+#include <QEvent>
 #include <QMdiArea>
 #include <QMdiSubWindow>
 
@@ -104,9 +105,13 @@ QString mbCoreWindowManager::getMdiSubWindowNameWithPrefix(const QMdiSubWindow *
     return QString();
 }
 
-void mbCoreWindowManager::showDataViewUi(const mbCoreDataViewUi *ui)
+void mbCoreWindowManager::showDataViewUi(mbCoreDataViewUi *ui)
 {
-    showSubWindow(ui);
+    QMdiSubWindow *sw = m_hashWindows.value(ui);
+    if (sw)
+        showSubWindow(sw);
+    else
+        dataViewUiAdd(ui);
 }
 
 void mbCoreWindowManager::actionWindowViewSubWindow()
@@ -121,9 +126,11 @@ void mbCoreWindowManager::actionWindowViewTabbed()
 
 void mbCoreWindowManager::actionWindowDataViewCloseAll()
 {
-    Q_FOREACH(QMdiSubWindow *sw, m_dataViews)
+    Q_FOREACH(mbCoreDataViewUi *ui, m_dataViewManager->dataViewUisCore())
     {
-        sw->close();
+        QMdiSubWindow *sw = m_hashWindows.value(ui);
+        if (sw)
+            closeSubWindow(sw);
     }
 }
 
@@ -206,6 +213,7 @@ QMdiSubWindow *mbCoreWindowManager::subWindowAdd(QWidget *ui)
     sw->setWindowIcon(icon);
     m_hashWindows.insert(ui, sw);
     m_area->addSubWindow(sw);
+    sw->installEventFilter(this);
     sw->show();
     return sw;
 }
@@ -216,6 +224,8 @@ QMdiSubWindow *mbCoreWindowManager::subWindowRemove(QWidget *ui)
     if (sw)
     {
         m_hashWindows.remove(ui);
+        if (m_area->activeSubWindow() == sw)
+            m_area->activateNextSubWindow();
         m_area->removeSubWindow(sw);
         sw->setWidget(nullptr);
         ui->setParent(nullptr);
@@ -253,10 +263,8 @@ void mbCoreWindowManager::setProject(mbCoreProject *p)
 void mbCoreWindowManager::dataViewUiAdd(mbCoreDataViewUi *ui)
 {
     QMdiSubWindow* sw = subWindowAdd(ui);
-    m_dataViews.append(sw);
     connect(ui, &mbCoreDataViewUi::nameChanged, sw, &QWidget::setWindowTitle);
     sw->setWindowTitle(ui->name());
-    Q_EMIT dataViewWindowAdded(ui);
 }
 
 void mbCoreWindowManager::dataViewUiRemove(mbCoreDataViewUi *ui)
@@ -265,9 +273,7 @@ void mbCoreWindowManager::dataViewUiRemove(mbCoreDataViewUi *ui)
     QMdiSubWindow* sw = subWindowRemove(ui);
     if (sw)
     {
-        Q_EMIT dataViewWindowRemoving(ui);
-        m_dataViews.removeOne(sw);
-        delete sw;
+        sw->deleteLater();
     }
 }
 
@@ -286,20 +292,33 @@ void mbCoreWindowManager::subWindowActivated(QMdiSubWindow *sw)
     }
 }
 
-void mbCoreWindowManager::showSubWindow(const QWidget *ui)
+void mbCoreWindowManager::showSubWindow(QMdiSubWindow *sw)
 {
-    QMdiSubWindow *sw = m_hashWindows.value(ui);
-    if (sw)
-    {
-        sw->show();
-        sw->widget()->show();
-        m_area->setActiveSubWindow(sw);
-    }
+    sw->show();
+    sw->widget()->show();
+    m_area->setActiveSubWindow(sw);
 }
 
-void mbCoreWindowManager::closeSubWindow(const QWidget *ui)
+void mbCoreWindowManager::closeSubWindow(QMdiSubWindow *sw)
 {
-    QMdiSubWindow *sw = m_hashWindows.value(ui);
-    if (sw)
-        sw->close();
+    subWindowRemove(sw->widget());
+    sw->deleteLater();
 }
+
+bool mbCoreWindowManager::eventFilter(QObject *obj, QEvent *e)
+{
+    switch (e->type())
+    {
+    case QEvent::Close:
+    {
+        QMdiSubWindow *sw = qobject_cast<QMdiSubWindow*>(obj);
+        //Q_ASSERT (sw != nullptr);
+        closeSubWindow(sw);
+        return true;
+    }
+    default:
+        break;
+    }
+    return QObject::eventFilter(obj, e);
+}
+

src/core/gui/core_windowmanager.h

@@ -71,7 +71,7 @@ class MB_EXPORT mbCoreWindowManager : public QObject
     virtual QString getMdiSubWindowNameWithPrefix(const QMdiSubWindow *sw) const;
 
 public Q_SLOTS:
-    void showDataViewUi(const mbCoreDataViewUi *ui);
+    void showDataViewUi(mbCoreDataViewUi *ui);
     void actionWindowViewSubWindow();
     void actionWindowViewTabbed();
     void actionWindowDataViewCloseAll();
@@ -92,8 +92,6 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void viewModeChanged(int viewMode);
-    void dataViewWindowAdded(mbCoreDataViewUi *ui);
-    void dataViewWindowRemoving(mbCoreDataViewUi *ui);
 
 protected Q_SLOTS:
     void setProject(mbCoreProject *p);
@@ -104,18 +102,15 @@ protected Q_SLOTS:
     virtual void subWindowActivated(QMdiSubWindow *sw);
 
 protected:
-    void showSubWindow(const QWidget *ui);
-    void closeSubWindow(const QWidget *ui);
+    void showSubWindow(QMdiSubWindow *sw);
+    virtual void closeSubWindow(QMdiSubWindow *sw);
+    bool eventFilter(QObject *obj, QEvent *e) override;
 
 protected:
     QMdiArea *m_area;
     mbCoreUi *m_ui;
     mbCoreDataViewManager *m_dataViewManager;
 
-    // DataViews
-    typedef QList<QMdiSubWindow*> DataViews_t;
-    DataViews_t m_dataViews;
-
     // Windows
     typedef QHash<const QWidget*, QMdiSubWindow*> HashWindows_t;
     HashWindows_t m_hashWindows;

src/server/gui/project/server_projectui.cpp

@@ -81,7 +81,7 @@ void mbServerProjectUi::selectionChanged(const QItemSelection &selected, const Q
     {
         mbServerDeviceRef *ref = static_cast<mbServerProjectModel*>(m_model)->deviceRef(ls.first());
         if (ref)
-            mbServer::global()->ui()->windowManager()->setActiveDevice(ref->device());
+            Q_EMIT deviceClick(ref->device());
     }
     mbCoreProjectUi::selectionChanged(selected, deselected);
 }

src/server/gui/project/server_projectui.h

@@ -44,6 +44,7 @@ class mbServerProjectUi : public mbCoreProjectUi
     inline mbServerDeviceRef *selectedDeviceRef() const { return currentDeviceRef(); }
 
 Q_SIGNALS:
+    void deviceClick(mbServerDevice *device);
     void deviceDoubleClick(mbServerDeviceRef *device);
     void deviceContextMenu(mbServerDeviceRef *device);
 

src/server/gui/server_ui.cpp

@@ -191,19 +191,21 @@ void mbServerUi::initialize()
 
     // Mdi Area
     m_deviceManager = new mbServerDeviceManager(this);
-    connect(m_deviceManager, &mbServerDeviceManager::deviceUiContextMenu, this, &mbServerUi::contextMenuDevice);
+    connect(m_deviceManager, &mbServerDeviceManager::deviceUiContextMenu, this, &mbServerUi::contextMenuDevice );
+    connect(m_deviceManager, &mbServerDeviceManager::deviceUiAdd        , this, &mbServerUi::deviceWindowAdd   );
+    connect(m_deviceManager, &mbServerDeviceManager::deviceUiRemove     , this, &mbServerUi::deviceWindowRemove);
 
     m_scriptManager = new mbServerScriptManager(this);
+    connect(m_scriptManager, &mbServerScriptManager::scriptEditorAdd   , this, &mbServerUi::scriptWindowAdd   );
+    connect(m_scriptManager, &mbServerScriptManager::scriptEditorRemove, this, &mbServerUi::scriptWindowRemove);
+
     m_dataViewManager = new mbServerDataViewManager(this);
 
     m_windowManager = new mbServerWindowManager(this, m_deviceManager, m_scriptManager, dataViewManager());
-    connect(windowManager(), &mbServerWindowManager::deviceWindowAdded   , this, &mbServerUi::deviceWindowAdd);
-    connect(windowManager(), &mbServerWindowManager::deviceWindowRemoving, this, &mbServerUi::deviceWindowRemove);
-    connect(windowManager(), &mbServerWindowManager::scriptWindowAdded   , this, &mbServerUi::scriptWindowAdd);
-    connect(windowManager(), &mbServerWindowManager::scriptWindowRemoving, this, &mbServerUi::scriptWindowRemove);
 
     // Project Inspector
     m_projectUi = new mbServerProjectUi(ui->dockProject);
+    connect(projectUi(), &mbServerProjectUi::deviceClick, windowManager(), &mbServerWindowManager::setActiveDevice);
     connect(projectUi(), &mbServerProjectUi::deviceDoubleClick, this, &mbServerUi::editDeviceRef       );
     connect(projectUi(), &mbServerProjectUi::deviceContextMenu, this, &mbServerUi::contextMenuDeviceRef);
 

src/server/gui/server_windowmanager.cpp

@@ -150,17 +150,6 @@ mbServerDevice *mbServerWindowManager::activeDevice() const
     return m_deviceManager->activeDevice();
 }
 
-void mbServerWindowManager::setActiveDevice(mbServerDevice *device)
-{
-    mbServerDeviceUi *ui = m_deviceManager->deviceUi(device);
-    if (ui)
-    {
-        QMdiSubWindow *sw = m_hashWindows.value(ui);
-        if (sw)
-            m_area->setActiveSubWindow(sw);
-    }
-}
-
 void mbServerWindowManager::showScriptModule(mbServerScriptModule *sm)
 {
     mbServerScriptModuleEditor *se = m_scriptManager->scriptModuleEditor(sm);
@@ -181,7 +170,11 @@ void mbServerWindowManager::showDeviceScript(mbServerDevice *device, mbServerDev
 
 void mbServerWindowManager::showScriptEditor(mbServerBaseScriptEditor *scriptEditor)
 {
-    showSubWindow(scriptEditor);
+    QMdiSubWindow *sw = m_hashWindows.value(scriptEditor);
+    if (sw)
+        showSubWindow(sw);
+    else
+        scriptEditorAdd(scriptEditor);
 }
 
 void mbServerWindowManager::setActiveScriptEditor(mbServerBaseScriptEditor *scriptEditor)
@@ -191,24 +184,39 @@ void mbServerWindowManager::setActiveScriptEditor(mbServerBaseScriptEditor *scri
         m_area->setActiveSubWindow(sw);
 }
 
-void mbServerWindowManager::showDeviceUi(const mbServerDeviceUi *ui)
+void mbServerWindowManager::setActiveDevice(mbServerDevice *device)
+{
+    mbServerDeviceUi *ui = m_deviceManager->deviceUi(device);
+    if (ui)
+        showDeviceUi(ui);
+}
+
+void mbServerWindowManager::showDeviceUi(mbServerDeviceUi *ui)
 {
-    showSubWindow(ui);
+    QMdiSubWindow *sw = m_hashWindows.value(ui);
+    if (sw)
+        showSubWindow(sw);
+    else
+        deviceUiAdd(ui);
 }
 
 void mbServerWindowManager::actionWindowDeviceCloseAll()
 {
-    Q_FOREACH(QMdiSubWindow *sw, m_devices)
+    Q_FOREACH(mbServerDeviceUi *ui, m_deviceManager->deviceUis())
     {
-        sw->close();
+        QMdiSubWindow *sw = m_hashWindows.value(ui);
+        if (sw)
+            closeSubWindow(sw);
     }
 }
 
 void mbServerWindowManager::actionWindowScriptCloseAll()
 {
-    Q_FOREACH(QMdiSubWindow *sw, m_scriptEditors)
+    Q_FOREACH(mbServerBaseScriptEditor *ui, m_scriptManager->scriptEditors())
     {
-        sw->close();
+        QMdiSubWindow *sw = m_hashWindows.value(ui);
+        if (sw)
+            closeSubWindow(sw);
     }
 }
 
@@ -222,10 +230,8 @@ void mbServerWindowManager::actionWindowCloseAll()
 void mbServerWindowManager::deviceUiAdd(mbServerDeviceUi *ui)
 {
     QMdiSubWindow* sw = subWindowAdd(ui);
-    m_devices.append(sw);
     connect(ui, &mbServerDeviceUi::nameChanged, sw, &QWidget::setWindowTitle);
     sw->setWindowTitle(ui->name());
-    Q_EMIT deviceWindowAdded(ui);
 }
 
 void mbServerWindowManager::deviceUiRemove(mbServerDeviceUi *ui)
@@ -234,20 +240,15 @@ void mbServerWindowManager::deviceUiRemove(mbServerDeviceUi *ui)
     QMdiSubWindow* sw = subWindowRemove(ui);
     if (sw)
     {
-        Q_EMIT deviceWindowRemoving(ui);
-        m_devices.removeOne(sw);
-        delete sw;
+        sw->deleteLater();
     }
 }
 
 void mbServerWindowManager::scriptEditorAdd(mbServerBaseScriptEditor *ui)
 {
     QMdiSubWindow* sw = subWindowAdd(ui);
-    m_scriptEditors.append(sw);
     connect(ui, &mbServerBaseScriptEditor::nameChanged, sw, &QWidget::setWindowTitle);
     sw->setWindowTitle(ui->name());
-    sw->installEventFilter(this);
-    Q_EMIT scriptWindowAdded(ui);
 }
 
 void mbServerWindowManager::scriptEditorRemove(mbServerBaseScriptEditor *ui)
@@ -256,30 +257,10 @@ void mbServerWindowManager::scriptEditorRemove(mbServerBaseScriptEditor *ui)
     QMdiSubWindow* sw = subWindowRemove(ui);
     if (sw)
     {
-        Q_EMIT scriptWindowRemoving(ui);
-        m_scriptEditors.removeOne(sw);
         sw->deleteLater();
     }
 }
 
-bool mbServerWindowManager::eventFilter(QObject *obj, QEvent *e)
-{
-    switch (e->type())
-    {
-    case QEvent::Close:
-    {
-        QMdiSubWindow *sw = qobject_cast<QMdiSubWindow*>(obj);
-        //Q_ASSERT (sw != nullptr);
-        mbServerBaseScriptEditor *ui = qobject_cast<mbServerBaseScriptEditor*>(sw->widget());
-        m_scriptManager->removeScriptEditor(ui);
-        return true;
-    }
-    default:
-        break;
-    }
-    return QObject::eventFilter(obj, e);
-}
-
 void mbServerWindowManager::subWindowActivated(QMdiSubWindow *sw)
 {
     if (sw)
@@ -302,3 +283,11 @@ void mbServerWindowManager::subWindowActivated(QMdiSubWindow *sw)
         mbCoreWindowManager::subWindowActivated(sw);
     }
 }
+
+void mbServerWindowManager::closeSubWindow(QMdiSubWindow *sw)
+{
+    if (mbServerBaseScriptEditor *ui = qobject_cast<mbServerBaseScriptEditor*>(sw->widget()))
+        m_scriptManager->removeScriptEditor(ui);
+    else
+        mbCoreWindowManager::closeSubWindow(sw);
+}