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

Timestamp:

Apr 26, 2021 8:16:09 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Some fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerWidget.cpp (modified) (8 diffs)
• UIVMLogViewerWidget.h (modified) (1 diff)

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

@@ -161 +161 @@
     prepare();
     restorePanelVisibility();
+    if (!comMachine.isNull())
+        setMachines(QVector<QUuid>(1, comMachine.GetId()));
 }
 
@@ -199 +201 @@
 {
     QVector<QUuid> selectedMachines;
-    /* List of machines that are newly added to selected machine list: */
-    QVector<QUuid> newSelections;
 
     foreach (const UIVirtualMachineItem *item, items)
@@ -208 +208 @@
         selectedMachines << item->id();
     }
-
+    setMachines(selectedMachines);
+}
+
+void UIVMLogViewerWidget::setMachines(const QVector<QUuid> &machineIDs)
+{
+    /* List of machines that are newly added to selected machine list: */
+    QVector<QUuid> newSelections;
     QVector<QUuid> unselectedMachines(m_machines);
 
-    foreach (const QUuid &id, selectedMachines)
+    foreach (const QUuid &id, machineIDs)
     {
         unselectedMachines.removeAll(id);
@@ -217 +223 @@
             newSelections << id;
     }
-    m_machines = selectedMachines;
+    m_machines = machineIDs;
 
     m_pTabWidget->hide();
@@ -225 +231 @@
     removeLogViewerPages(unselectedMachines);
     m_pTabWidget->show();
-
-    printf("new selections\n");
-    foreach (const QUuid &id, newSelections)
-        printf("%s\n", qPrintable(id.toString()));
-    printf("unselected\n");
-    foreach (const QUuid &id, unselectedMachines)
-        printf("%s\n", qPrintable(id.toString()));
 }
 
@@ -629 +628 @@
             /* Add into layout: */
             m_pMainLayout->addWidget(m_pTabWidget);
+#if 0
             m_pCornerButton = new QIToolButton(m_pTabWidget);
+#endif
             if (m_pCornerButton)
             {
@@ -637 +638 @@
                 connect(m_pCornerButton, &QIToolButton::clicked, this, &UIVMLogViewerWidget::sltCornerButtonClicked);
             }
+
         }
 
@@ -808 +810 @@
         m_pToolBar->updateLayout();
 #endif
-    m_pCornerButton->setToolTip(tr("Select machines to show their log"));
+    if (m_pCornerButton)
+        m_pCornerButton->setToolTip(tr("Select machines to show their log"));
 }
 

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

@@ -199 +199 @@
     void manageEscapeShortCut();
     void updateMachineSelectionMenu();
+    void setMachines(const QVector<QUuid> &machineIDs);
 
     /** Holds the widget's embedding type. */