Changeset 89599 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 10, 2021 1:11:03 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145043

Message:

FE/Qt: bugref:9930. Allow closing log tabs

Location:

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

Files:

• UIVMLogViewerWidget.cpp (modified) (7 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

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

@@ -121 +121 @@
 void UITabBar::paintEvent(QPaintEvent *pEvent)
 {
-
     Q_UNUSED(pEvent);
     QStylePainter painter(this);
-
     for (int i = 0; i < count(); i++)
     {
@@ -629 +627 @@
     if (machineId.isNull())
         return;
-
+    QVector<QUuid> machineList;
+    machineList << machineId;
+    removeLogViewerPages(machineList);
 }
 
@@ -925 +925 @@
 }
 
-QVector<UIVMLogPage*> UIVMLogViewerWidget::logPages()
-{
-    QVector<UIVMLogPage*> pages;
+QVector<UIVMLogTab*> UIVMLogViewerWidget::logTabs()
+{
+    QVector<UIVMLogTab*> tabs;
     if (m_pTabWidget)
-        return pages;
+        return tabs;
     for (int i = 0; i < m_pTabWidget->count(); ++i)
     {
-        UIVMLogPage *pPage = logPage(i);
+        UIVMLogTab *pPage = logTab(i);
         if (pPage)
-            pages << pPage;
-    }
-    return pages;
+            tabs << pPage;
+    }
+    return tabs;
 }
 
@@ -984 +984 @@
         return 0;
     return qobject_cast<UIVMLogPage*>(m_pTabWidget->currentWidget());
+}
+
+UIVMLogTab *UIVMLogViewerWidget::logTab(int iIndex)
+{
+    if (!m_pTabWidget)
+        return 0;
+    return qobject_cast<UIVMLogTab*>(m_pTabWidget->widget(iIndex));
 }
 
@@ -1044 +1051 @@
     if (machineList.isEmpty() || !m_pTabWidget)
         return;
+
+    QVector<QUuid> currentMachineList(m_machines);
+    /* Make sure that we remove the machine(s) from our machine list: */
+    foreach (const QUuid &id, machineList)
+        currentMachineList.removeAll(id);
+    if (currentMachineList.isEmpty())
+        return;
+    m_machines = currentMachineList;
+
     m_pTabWidget->blockSignals(true);
     /* Cache log page pointers and tab titles: */
@@ -1049 +1065 @@
     for (int i = 0; i < m_pTabWidget->count(); ++i)
     {
-        UIVMLogTab *pTab = logPage(i);
+        UIVMLogTab *pTab = logTab(i);
         if (pTab)
             logTabs << QPair<UIVMLogTab*, QString>(pTab, m_pTabWidget->tabText(i));
@@ -1071 +1087 @@
     qDeleteAll(pagesToRemove.begin(), pagesToRemove.end());
     m_pTabWidget->blockSignals(false);
+    labelTabHandler();
+    markLabelTabs();
 }
 

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

@@ -49 +49 @@
 class UIVirtualMachineItem;
 class UIVMLogPage;
+class UIVMLogTab;
 class UIVMLogViewerBookmarksPanel;
 class UIVMLogViewerFilterPanel;
@@ -183 +184 @@
     const UIVMLogPage *currentLogPage() const;
     UIVMLogPage *currentLogPage();
-    /** Returns the log page at tab with iIndex if it contains a log page. Return 0 otherwise. */
+    /** Returns the log tab at tab with iIndex if it contains a log page. Return 0 otherwise. */
+    UIVMLogTab *logTab(int iIndex);
     UIVMLogPage *logPage(int iIndex);
     /** Returns a vector of all the log pages of the tab widget. */
-    QVector<UIVMLogPage*> logPages();
+    QVector<UIVMLogTab*> logTabs();
 
     void createLogViewerPages(const QVector<QUuid> &machineList);