Changeset 88644 in vbox for trunk/src/VBox

Timestamp:

Apr 22, 2021 8:09:38 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Populating the menu with selected items of the vm list

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerWidget.cpp (modified) (6 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (6 diffs)
• manager/UIToolPaneMachine.cpp (modified) (1 diff)

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

@@ -38 +38 @@
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
+#include "UIVirtualMachineItem.h"
 #include "UIVMLogPage.h"
 #include "UIVMLogViewerWidget.h"
@@ -53 +54 @@
 /** Limit the read string size to avoid bloated log viewer pages. */
 const ULONG uAllowedLogSize = _256M;
+
+UIVMLogViewerWidget::Machine::Machine(const QUuid &id, const QString &strName)
+    : m_id(id)
+    , m_strName(strName)
+{
+}
+
 UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding,
                                          UIActionPool *pActionPool,
@@ -121 +129 @@
 }
 
+void UIVMLogViewerWidget::setSelectedVMListItems(const QList<UIVirtualMachineItem*> &items)
+{
+    m_machines.clear();
+    foreach (const UIVirtualMachineItem *item, items)
+    {
+        if (!item)
+            continue;
+        m_machines << Machine(item->id(), item->name());
+    }
+    updateMachineSelectionMenu();
+}
+
 QFont UIVMLogViewerWidget::currentFont() const
 {
@@ -502 +522 @@
                 m_pMachineSelectionMenu = new QMenu(this);
                 m_pCornerButton->setMenu(m_pMachineSelectionMenu);
+                m_pCornerButton->setPopupMode(QToolButton::InstantPopup);
             }
         }
@@ -688 +709 @@
         m_pToolBar->updateLayout();
 #endif
+    m_pCornerButton->setToolTip(tr("Select machines to show their log"));
 }
 
@@ -932 +954 @@
     m_visiblePanelsList.back()->setCloseButtonShortCut(QKeySequence(Qt::Key_Escape));
 }
+
+void UIVMLogViewerWidget::updateMachineSelectionMenu()
+{
+    if (!m_pMachineSelectionMenu)
+    {
+        m_pMachineSelectionMenu = new QMenu(this);
+        if (m_pCornerButton)
+            m_pCornerButton->setMenu(m_pMachineSelectionMenu);
+    }
+    m_pMachineSelectionMenu->clear();
+
+    foreach (const Machine &machine, m_machines)
+    {
+        QAction *pAction = m_pMachineSelectionMenu->addAction(machine.m_strName);
+        pAction->setCheckable(true);
+        pAction->setData(machine.m_id);
+    }
+}

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

@@ -44 +44 @@
 class QIToolBar;
 class QIToolButton;
+class UIVirtualMachineItem;
 class UIVMLogPage;
 class UIVMLogViewerBookmarksPanel;
@@ -86 +87 @@
     /** Defines the @a comMachine whose logs to show. */
     void setMachine(const CMachine &comMachine);
+    void setSelectedVMListItems(const QList<UIVirtualMachineItem*> &items);
     QFont currentFont() const;
 
@@ -137 +139 @@
 
 private:
-
+        struct Machine
+        {
+            Machine(const QUuid &id, const QString &strName);
+            QUuid   m_id;
+            QString m_strName;
+        };
     /** @name Prepare/Cleanup
       * @{ */
@@ -184 +191 @@
     /** Resets document (of the curent tab) and scrollbar highligthing */
     void resetHighlighthing();
-
     void hidePanel(UIDialogPanel* panel);
     void showPanel(UIDialogPanel* panel);
-
     /** Make sure escape key is assigned to only a single widget. This is done by checking
         several things in the following order:
@@ -194 +199 @@
         - assigned it to the most recently "unhidden" panel */
     void manageEscapeShortCut();
+    void updateMachineSelectionMenu();
 
     /** Holds the widget's embedding type. */
@@ -203 +209 @@
     /** Holds the machine instance. */
     CMachine      m_comMachine;
+    QVector<Machine> m_machines;
 
     /** Holds whether the dialog is polished. */

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

@@ -279 +279 @@
         m_pPaneDetails->setItems(m_items);
     }
+    /* Update logs pane is it is open: */
+    if (isToolOpened(UIToolType_Logs))
+    {
+        AssertPtrReturnVoid(m_pPaneLogViewer);
+        m_pPaneLogViewer->setSelectedVMListItems(m_items);
+    }
 }