Implement 'CloseAll' menu action for MDI windows

Author: serhmarch

src/core/gui/core_ui.cpp

@@ -217,7 +217,6 @@ void mbCoreUi::initialize()
     // Menu Window
     connect(m_ui.actionWindowViewSubWindow   , &QAction::triggered, this, &mbCoreUi::menuSlotWindowViewSubWindow   );
     connect(m_ui.actionWindowViewTabbed      , &QAction::triggered, this, &mbCoreUi::menuSlotWindowViewTabbed      );
-    connect(m_ui.actionWindowDataViewShowAll , &QAction::triggered, this, &mbCoreUi::menuSlotWindowDataViewShowAll );
     connect(m_ui.actionWindowDataViewCloseAll, &QAction::triggered, this, &mbCoreUi::menuSlotWindowDataViewCloseAll);
     connect(m_ui.actionWindowCloseAll        , &QAction::triggered, this, &mbCoreUi::menuSlotWindowCloseAll        );
     connect(m_ui.actionWindowCascade         , &QAction::triggered, this, &mbCoreUi::menuSlotWindowCascade         );
@@ -845,11 +844,6 @@ void mbCoreUi::menuSlotWindowViewTabbed()
     m_windowManager->actionWindowViewTabbed();
 }
 
-void mbCoreUi::menuSlotWindowDataViewShowAll()
-{
-    m_windowManager->actionWindowDataViewShowAll();
-}
-
 void mbCoreUi::menuSlotWindowDataViewCloseAll()
 {
     m_windowManager->actionWindowDataViewCloseAll();

src/core/gui/core_ui.h

@@ -172,13 +172,12 @@ protected Q_SLOTS:
     // ----------------------------
     // -----------WINDOW-----------
     // ----------------------------
-    virtual void menuSlotWindowViewSubWindow      ();
-    virtual void menuSlotWindowViewTabbed         ();
-    virtual void menuSlotWindowDataViewShowAll    ();
-    virtual void menuSlotWindowDataViewCloseAll   ();
-    virtual void menuSlotWindowCloseAll           ();
-    virtual void menuSlotWindowCascade            ();
-    virtual void menuSlotWindowTile               ();
+    virtual void menuSlotWindowViewSubWindow   ();
+    virtual void menuSlotWindowViewTabbed      ();
+    virtual void menuSlotWindowDataViewCloseAll();
+    virtual void menuSlotWindowCloseAll        ();
+    virtual void menuSlotWindowCascade         ();
+    virtual void menuSlotWindowTile            ();
     // ----------------------------
     // ------------HELP------------
     // ----------------------------

src/core/gui/core_windowmanager.cpp

@@ -119,22 +119,6 @@ void mbCoreWindowManager::actionWindowViewTabbed()
     setViewMode(QMdiArea::TabbedView);
 }
 
-void mbCoreWindowManager::actionWindowDataViewShowAll()
-{
-    Q_FOREACH(QMdiSubWindow *sw, m_dataViews)
-    {
-        sw->show();
-        sw->widget()->show();
-    }
-}
-
-void mbCoreWindowManager::actionWindowDataViewShowActive()
-{
-    mbCoreDataViewUi *ui = m_dataViewManager->activeDataViewUiCore();
-    if (ui)
-        showSubWindow(ui);
-}
-
 void mbCoreWindowManager::actionWindowDataViewCloseAll()
 {
     Q_FOREACH(QMdiSubWindow *sw, m_dataViews)
@@ -143,33 +127,6 @@ void mbCoreWindowManager::actionWindowDataViewCloseAll()
     }
 }
 
-void mbCoreWindowManager::actionWindowDataViewCloseActive()
-{
-    mbCoreDataViewUi *ui = m_dataViewManager->activeDataViewUiCore();
-    if (ui)
-        closeSubWindow(ui);
-}
-
-void mbCoreWindowManager::actionWindowShowAll()
-{
-    actionWindowDataViewShowAll();
-}
-
-void mbCoreWindowManager::actionWindowShowActive()
-{
-    QMdiSubWindow *sw = m_area->activeSubWindow();
-    if (sw)
-    {
-        sw->show();
-        sw->widget()->show();
-    }
-}
-
-void mbCoreWindowManager::actionWindowCloseActive()
-{
-    m_area->closeActiveSubWindow();
-}
-
 void mbCoreWindowManager::actionWindowCloseAll()
 {
     actionWindowDataViewCloseAll();

src/core/gui/core_windowmanager.h

@@ -74,14 +74,8 @@ public Q_SLOTS:
     void showDataViewUi(const mbCoreDataViewUi *ui);
     void actionWindowViewSubWindow();
     void actionWindowViewTabbed();
-    void actionWindowDataViewShowAll();
-    void actionWindowDataViewShowActive();
     void actionWindowDataViewCloseAll();
-    void actionWindowDataViewCloseActive();
-    virtual void actionWindowShowAll();
-    void actionWindowShowActive();
     virtual void actionWindowCloseAll();
-    void actionWindowCloseActive();
     void actionWindowCascade();
     void actionWindowTile();
 

src/server/gui/server_ui.cpp

@@ -270,14 +270,8 @@ void mbServerUi::initialize()
     connect(ui->actionScriptModuleExport    , &QAction::triggered, this, &mbServerUi::menuSlotScriptModuleExport    );
 
     // Menu Window
-    //connect(ui->actionWindowDeviceShowAll      , &QAction::triggered, this, &mbServerUi::menuSlotWindowDeviceShowAll      );
-    //connect(ui->actionWindowDeviceShowActive   , &QAction::triggered, this, &mbServerUi::menuSlotWindowDeviceShowActive   );
-    //connect(ui->actionWindowDeviceCloseAll     , &QAction::triggered, this, &mbServerUi::menuSlotWindowDeviceCloseAll     );
-    //connect(ui->actionWindowDeviceCloseActive  , &QAction::triggered, this, &mbServerUi::menuSlotWindowDeviceCloseActive  );
-    //connect(ui->actionWindowDataViewShowAll    , &QAction::triggered, this, &mbServerUi::menuSlotWindowDataViewShowAll    );
-    //connect(ui->actionWindowDataViewShowActive , &QAction::triggered, this, &mbServerUi::menuSlotWindowDataViewShowActive );
-    //connect(ui->actionWindowDataViewCloseAll   , &QAction::triggered, this, &mbServerUi::menuSlotWindowDataViewCloseAll   );
-    //connect(ui->actionWindowDataViewCloseActive, &QAction::triggered, this, &mbServerUi::menuSlotWindowDataViewCloseActive);
+    connect(ui->actionWindowDeviceCloseAll  , &QAction::triggered, this, &mbServerUi::menuSlotWindowDeviceCloseAll  );
+    connect(ui->actionWindowScriptCloseAll  , &QAction::triggered, this, &mbServerUi::menuSlotWindowScriptCloseAll  );
 
     // tool bar
     // add data view format functionality to the end of toolbar
@@ -1038,24 +1032,14 @@ void mbServerUi::menuSlotScriptModuleExport()
     }
 }
 
-void mbServerUi::menuSlotWindowDeviceShowAll()
-{
-    windowManager()->actionWindowDeviceShowAll();
-}
-
-void mbServerUi::menuSlotWindowDeviceShowActive()
-{
-    windowManager()->actionWindowDeviceShowActive();
-}
-
 void mbServerUi::menuSlotWindowDeviceCloseAll()
 {
     windowManager()->actionWindowDeviceCloseAll();
 }
 
-void mbServerUi::menuSlotWindowDeviceCloseActive()
+void mbServerUi::menuSlotWindowScriptCloseAll()
 {
-    windowManager()->actionWindowDeviceCloseActive();
+    windowManager()->actionWindowScriptCloseAll();
 }
 
 void mbServerUi::slotSimActionCopy()

src/server/gui/server_ui.h

@@ -179,10 +179,8 @@ private Q_SLOTS:
     // ----------------------------
     // -----------WINDOW-----------
     // ----------------------------
-    void menuSlotWindowDeviceShowAll    ();
-    void menuSlotWindowDeviceShowActive ();
-    void menuSlotWindowDeviceCloseAll   ();
-    void menuSlotWindowDeviceCloseActive();
+    void menuSlotWindowDeviceCloseAll();
+    void menuSlotWindowScriptCloseAll();
 
 protected Q_SLOTS: // non menu slots
     void slotSimActionCopy();

src/server/gui/server_windowmanager.cpp

@@ -196,45 +196,25 @@ void mbServerWindowManager::showDeviceUi(const mbServerDeviceUi *ui)
     showSubWindow(ui);
 }
 
-void mbServerWindowManager::actionWindowDeviceShowAll()
+void mbServerWindowManager::actionWindowDeviceCloseAll()
 {
     Q_FOREACH(QMdiSubWindow *sw, m_devices)
     {
-        sw->show();
-        sw->widget()->show();
+        sw->close();
     }
 }
 
-void mbServerWindowManager::actionWindowDeviceShowActive()
-{
-    mbServerDeviceUi *ui = m_deviceManager->activeDeviceUi();
-    if (ui)
-        showSubWindow(ui);
-}
-
-void mbServerWindowManager::actionWindowDeviceCloseAll()
+void mbServerWindowManager::actionWindowScriptCloseAll()
 {
-    Q_FOREACH(QMdiSubWindow *sw, m_devices)
+    Q_FOREACH(QMdiSubWindow *sw, m_scriptEditors)
     {
         sw->close();
     }
 }
 
-void mbServerWindowManager::actionWindowDeviceCloseActive()
-{
-    mbServerDeviceUi *ui = m_deviceManager->activeDeviceUi();
-    if (ui)
-        closeSubWindow(ui);
-}
-
-void mbServerWindowManager::actionWindowShowAll()
-{
-    actionWindowDeviceShowAll();
-    actionWindowDataViewShowAll();
-}
-
 void mbServerWindowManager::actionWindowCloseAll()
 {
+    actionWindowScriptCloseAll();
     actionWindowDeviceCloseAll();
     mbCoreWindowManager::actionWindowCloseAll();
 }

src/server/gui/server_windowmanager.h

@@ -86,11 +86,8 @@ class mbServerWindowManager : public mbCoreWindowManager
 
 public Q_SLOTS:
     void showDeviceUi(const mbServerDeviceUi *ui);
-    void actionWindowDeviceShowAll();
-    void actionWindowDeviceShowActive();
     void actionWindowDeviceCloseAll();
-    void actionWindowDeviceCloseActive();
-    void actionWindowShowAll() override;
+    void actionWindowScriptCloseAll();
     void actionWindowCloseAll() override;
 
 private Q_SLOTS: