Improved icon view for Tabbed/SubWindow MDI window modes

Author: serhmarch

src/core/gui/core_windowmanager.cpp

@@ -231,10 +231,41 @@ void mbCoreWindowManager::setViewMode(QMdiArea::ViewMode viewMode)
     if (m_area->viewMode() != viewMode)
     {
         m_area->setViewMode(viewMode);
+        QIcon icon = (viewMode == QMdiArea::TabbedView) ? QIcon() : m_area->windowIcon();
+        Q_FOREACH(QMdiSubWindow *sw, m_hashWindows)
+            sw->setWindowIcon(icon);
         Q_EMIT viewModeChanged(viewMode);
     }
 }
 
+QMdiSubWindow *mbCoreWindowManager::subWindowAdd(QWidget *ui)
+{
+    QMdiSubWindow* sw = new QMdiSubWindow(m_area);
+    //sw->setWindowIcon(QIcon());
+    //sw->setAttribute(Qt::WA_DeleteOnClose, false);
+    sw->setWidget(ui);
+    sw->setWindowFlag(Qt::CustomizeWindowHint, false);
+    QIcon icon = (viewMode() == QMdiArea::TabbedView) ? QIcon() : m_area->windowIcon();
+    sw->setWindowIcon(icon);
+    m_hashWindows.insert(ui, sw);
+    m_area->addSubWindow(sw);
+    sw->show();
+    return sw;
+}
+
+QMdiSubWindow *mbCoreWindowManager::subWindowRemove(QWidget *ui)
+{
+    QMdiSubWindow* sw = m_hashWindows.value(ui, nullptr);
+    if (sw)
+    {
+        m_hashWindows.remove(ui);
+        m_area->removeSubWindow(sw);
+        sw->setWidget(nullptr);
+        ui->setParent(nullptr);
+    }
+    return sw;
+}
+
 bool mbCoreWindowManager::restoreWindowStateInner(mbCoreBinaryReader &reader)
 {
     QString nameWithPrefix;
@@ -264,29 +295,19 @@ void mbCoreWindowManager::setProject(mbCoreProject *p)
 
 void mbCoreWindowManager::dataViewUiAdd(mbCoreDataViewUi *ui)
 {
-    QMdiSubWindow* sw = new QMdiSubWindow(m_area);
-    sw->setWidget(ui);
-    //sw->setAttribute(Qt::WA_DeleteOnClose, false);
-    sw->setWindowFlag(Qt::CustomizeWindowHint, false);
+    QMdiSubWindow* sw = subWindowAdd(ui);
     m_dataViews.append(sw);
-    m_hashWindows.insert(ui, sw);
     connect(ui, &mbCoreDataViewUi::nameChanged, sw, &QWidget::setWindowTitle);
     sw->setWindowTitle(ui->name());
-    m_area->addSubWindow(sw);
-    sw->show();
 }
 
 void mbCoreWindowManager::dataViewUiRemove(mbCoreDataViewUi *ui)
 {
     ui->disconnect(this);
-    QMdiSubWindow* sw = m_hashWindows.value(ui, nullptr);
+    QMdiSubWindow* sw = subWindowRemove(ui);
     if (sw)
     {
         m_dataViews.removeOne(sw);
-        m_hashWindows.remove(ui);
-        m_area->removeSubWindow(sw);
-        sw->setWidget(nullptr);
-        ui->setParent(nullptr);
         delete sw;
     }
 }

src/core/gui/core_windowmanager.h

@@ -91,6 +91,8 @@ public Q_SLOTS:
 
 protected:
     void setViewMode(QMdiArea::ViewMode viewMode);
+    QMdiSubWindow *subWindowAdd(QWidget *ui);
+    QMdiSubWindow *subWindowRemove(QWidget *ui);
     void saveWindowStateInner(mbCoreBinaryWriter &writer, const QString &nameWithPrefix, const QWidget *w);
     bool restoreWindowStateInner(mbCoreBinaryReader &reader);
 

src/server/gui/server_windowmanager.cpp

@@ -236,57 +236,39 @@ void mbServerWindowManager::actionWindowCloseAll()
 
 void mbServerWindowManager::deviceUiAdd(mbServerDeviceUi *ui)
 {
-    QMdiSubWindow* sw = new QMdiSubWindow(m_area);
-    sw->setWidget(ui);
-    //sw->setAttribute(Qt::WA_DeleteOnClose, false);
+    QMdiSubWindow* sw = subWindowAdd(ui);
     m_devices.append(sw);
-    m_hashWindows.insert(ui, sw);
     connect(ui, &mbServerDeviceUi::nameChanged, sw, &QWidget::setWindowTitle);
     sw->setWindowTitle(ui->name());
-    m_area->addSubWindow(sw);
-    sw->show();
 }
 
 void mbServerWindowManager::deviceUiRemove(mbServerDeviceUi *ui)
 {
     ui->disconnect(this);
-    QMdiSubWindow* sw = m_hashWindows.value(ui, nullptr);
+    QMdiSubWindow* sw = subWindowRemove(ui);
     if (sw)
     {
         m_devices.removeOne(sw);
-        m_hashWindows.remove(ui);
-        m_area->removeSubWindow(sw);
-        sw->setWidget(nullptr);
-        ui->setParent(nullptr);
         delete sw;
     }
 }
 
 void mbServerWindowManager::scriptEditorAdd(mbServerBaseScriptEditor *ui)
 {
-    QMdiSubWindow* sw = new QMdiSubWindow(m_area);
-    sw->setWidget(ui);
-    //sw->setAttribute(Qt::WA_DeleteOnClose, false);
+    QMdiSubWindow* sw = subWindowAdd(ui);
     m_scriptEditors.append(sw);
-    m_hashWindows.insert(ui, sw);
     connect(ui, &mbServerBaseScriptEditor::nameChanged, sw, &QWidget::setWindowTitle);
     sw->setWindowTitle(ui->name());
     sw->installEventFilter(this);
-    m_area->addSubWindow(sw);
-    sw->show();
 }
 
 void mbServerWindowManager::scriptEditorRemove(mbServerBaseScriptEditor *ui)
 {
     ui->disconnect(this);
-    QMdiSubWindow* sw = m_hashWindows.value(ui, nullptr);
+    QMdiSubWindow* sw = subWindowRemove(ui);
     if (sw)
     {
         m_scriptEditors.removeOne(sw);
-        m_hashWindows.remove(ui);
-        m_area->removeSubWindow(sw);
-        //sw->setWidget(nullptr);
-        //ui->setParent(nullptr);
         sw->deleteLater();
     }
 }