Changeset 89585 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 9, 2021 4:03:51 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt:bugref:9315. Avoiding multiple UILogViewerDialog instances in manager UI

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerDialog.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerDialog.h (modified) (2 diffs)
• logviewer/UIVMLogViewerWidget.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (3 diffs)
• manager/UIVirtualBoxManager.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

@@ -74 +74 @@
     if (pWidget)
         pWidget->setDialogBeingClosed(true);
+}
+
+void UIVMLogViewerDialog::setSelectedVMListItems(const QList<UIVirtualMachineItem*> &items)
+{
+    Q_UNUSED(items);
+    UIVMLogViewerWidget *pLogViewerWidget = qobject_cast<UIVMLogViewerWidget*>(widget());
+    if (pLogViewerWidget)
+        pLogViewerWidget->setSelectedVMListItems(items);
+}
+
+void UIVMLogViewerDialog::addSelectedVMListItems(const QList<UIVirtualMachineItem*> &items)
+{
+    Q_UNUSED(items);
+    UIVMLogViewerWidget *pLogViewerWidget = qobject_cast<UIVMLogViewerWidget*>(widget());
+    if (pLogViewerWidget)
+        pLogViewerWidget->addSelectedVMListItems(items);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.h

@@ -40 +40 @@
 class UIActionPool;
 class UIVMLogViewerDialog;
+class UIVirtualMachineItem;
 class CMachine;
 
@@ -79 +80 @@
     UIVMLogViewerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CMachine &comMachine);
     ~UIVMLogViewerDialog();
+    void setSelectedVMListItems(const QList<UIVirtualMachineItem*> &items);
+    void addSelectedVMListItems(const QList<UIVirtualMachineItem*> &items);
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -222 +222 @@
 }
 
+void UIVMLogViewerWidget::addSelectedVMListItems(const QList<UIVirtualMachineItem*> &items)
+{
+    QVector<QUuid> selectedMachines(m_machines);
+
+    foreach (const UIVirtualMachineItem *item, items)
+    {
+        if (!item)
+            continue;
+        selectedMachines << item->id();
+    }
+    setMachines(selectedMachines);
+}
+
 void UIVMLogViewerWidget::setMachines(const QVector<QUuid> &machineIDs)
 {
@@ -960 +973 @@
         QString strMachineName = comMachine.GetName();
 
-        if (m_enmEmbedding == EmbedTo_Stack)
+        if (uiCommon().uiType() == UICommon::UIType_SelectorUI)
             m_pTabWidget->addTab(new UILabelTab(this, uMachineId), strMachineName);
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -88 +88 @@
 
     void setSelectedVMListItems(const QList<UIVirtualMachineItem*> &items);
+    void addSelectedVMListItems(const QList<UIVirtualMachineItem*> &items);
     QFont currentFont() const;
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -467 +467 @@
     , m_fFirstMediumEnumerationHandled(false)
     , m_pActionPool(0)
+    , m_pLogViewerDialog(0)
+    , m_pWidget(0)
     , m_iGeometrySaveTimerId(-1)
 {
@@ -2001 +2003 @@
     }
 
+    QList<UIVirtualMachineItem*> itemsToShowLogs;
+
     /* For each selected item: */
     foreach (UIVirtualMachineItem *pItem, items)
@@ -2012 +2016 @@
         if (!isActionEnabled(UIActionIndexMN_M_Group_S_ShowLogDialog, QList<UIVirtualMachineItem*>() << pItem))
             continue;
-
-        QIManagerDialog *pLogViewerDialog = 0;
-        /* Create and Show VM Log Viewer: */
-        if (!m_logViewers[pItemLocal->machine().GetHardwareUUID().toString()])
-        {
-            UIVMLogViewerDialogFactory dialogFactory(actionPool(), pItemLocal->machine());
-            dialogFactory.prepare(pLogViewerDialog, this);
-            if (pLogViewerDialog)
-            {
-                m_logViewers[pItemLocal->machine().GetHardwareUUID().toString()] = pLogViewerDialog;
-                connect(pLogViewerDialog, &QIManagerDialog::sigClose,
-                        this, &UIVirtualBoxManager::sltCloseLogViewerWindow);
-            }
-        }
-        else
-        {
-            pLogViewerDialog = m_logViewers[pItemLocal->machine().GetHardwareUUID().toString()];
-        }
-        if (pLogViewerDialog)
-        {
-            /* Show instance: */
-            pLogViewerDialog->show();
-            pLogViewerDialog->setWindowState(pLogViewerDialog->windowState() & ~Qt::WindowMinimized);
-            pLogViewerDialog->activateWindow();
-        }
-    }
+        itemsToShowLogs << pItem;
+    }
+
+    if (itemsToShowLogs.isEmpty())
+        return;
+    if (!m_pLogViewerDialog)
+    {
+        UIVMLogViewerDialogFactory dialogFactory(actionPool(), CMachine());
+        dialogFactory.prepare(m_pLogViewerDialog, this);
+        if (m_pLogViewerDialog)
+            connect(m_pLogViewerDialog, &QIManagerDialog::sigClose,
+                    this, &UIVirtualBoxManager::sltCloseLogViewerWindow);
+    }
+    AssertPtrReturnVoid(m_pLogViewerDialog);
+    UIVMLogViewerDialog *pDialog = qobject_cast<UIVMLogViewerDialog*>(m_pLogViewerDialog);
+    if (pDialog)
+        pDialog->addSelectedVMListItems(itemsToShowLogs);
+    m_pLogViewerDialog->show();
+    m_pLogViewerDialog->setWindowState(m_pLogViewerDialog->windowState() & ~Qt::WindowMinimized);
+    m_pLogViewerDialog->activateWindow();
 }
 
 void UIVirtualBoxManager::sltCloseLogViewerWindow()
 {
-    /* If there is a proper sender: */
-    if (qobject_cast<QIManagerDialog*>(sender()))
-    {
-        /* Search for the sender of the signal within the m_logViewers map: */
-        QMap<QString, QIManagerDialog*>::iterator sendersIterator = m_logViewers.begin();
-        while (sendersIterator != m_logViewers.end() && sendersIterator.value() != sender())
-            ++sendersIterator;
-        /* Do nothing if we cannot find it with the map: */
-        if (sendersIterator == m_logViewers.end())
-            return;
-
-        /* Check whether we have found the proper dialog: */
-        QIManagerDialog *pDialog = qobject_cast<QIManagerDialog*>(sendersIterator.value());
-        if (!pDialog)
-            return;
-
-        /* First remove this log-viewer dialog from the map.
-         * This should be done before closing the dialog which will incur
-         * a second call to this function and result in double delete!!! */
-        m_logViewers.erase(sendersIterator);
-        UIVMLogViewerDialogFactory().cleanup(pDialog);
-    }
-    /* Otherwise: */
-    else
-    {
-        /* Just wipe out everything: */
-        foreach (const QString &strKey, m_logViewers.keys())
-        {
-            /* First remove each log-viewer dialog from the map.
-             * This should be done before closing the dialog which will incur
-             * a second call to this function and result in double delete!!! */
-            QIManagerDialog *pDialog = m_logViewers.value(strKey);
-            m_logViewers.remove(strKey);
-            UIVMLogViewerDialogFactory().cleanup(pDialog);
-        }
-    }
-}
-
+    if (!m_pLogViewerDialog)
+        return;
+
+    QIManagerDialog* pDialog = m_pLogViewerDialog;
+    m_pLogViewerDialog = 0;
+    pDialog->close();
+    UIVMLogViewerDialogFactory().cleanup(pDialog);
+}
 
 void UIVirtualBoxManager::sltPerformRefreshMachine()

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -44 +44 @@
 typedef QIWithRestorableGeometry<QMainWindow> QMainWindowWithRestorableGeometry;
 typedef QIWithRetranslateUI<QMainWindowWithRestorableGeometry> QMainWindowWithRestorableGeometryAndRetranslateUi;
-typedef QMap<QString, QIManagerDialog*> VMLogViewerMap;
 
 /** Singleton QMainWindow extension used as VirtualBox Manager instance. */
@@ -453 +452 @@
     QMap<UIToolType, QIManagerDialog*>  m_managers;
 
-    /** Holds a map of (machineUUID, UIVMLogViewerDialog). */
-    VMLogViewerMap   m_logViewers;
+    /** Holds the instance of UIVMLogViewerDialog. */
+    QIManagerDialog   *m_pLogViewerDialog;
 
     /** Holds the central-widget instance. */