Changeset 89606 in vbox

Timestamp:

Jun 10, 2021 3:37:31 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Coonecting close button to slot

File:

• trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp (modified) (4 diffs)

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

@@ -67 +67 @@
 
     //UILogTabCloseButton(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName);
-    UILogTabCloseButton(QWidget *pParent = 0)
+    UILogTabCloseButton(QWidget *pParent, const QUuid &uMachineId)
         : QIToolButton(pParent)
+        , m_uMachineId(uMachineId)
     {
         setAutoRaise(true);
@@ -74 +75 @@
     }
 
+    const QUuid &machineId() const
+    {
+        return m_uMachineId;
+    }
+
 protected:
 
+    QUuid m_uMachineId;
 };
 /*********************************************************************************************************************************
@@ -305 +312 @@
         {
             pTabBar->setTabData(i, true);
-            UILogTabCloseButton *pCloseButton = new UILogTabCloseButton;
-            pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
-
-            pTabBar->setTabButton(i, QTabBar::RightSide, pCloseButton);
-            connect(pCloseButton, &UILogTabCloseButton::clicked, this, &UIVMLogViewerWidget::sltTabCloseButtonClick);
+            UIVMLogTab *pTab = logTab(i);
+            if (pTab)
+            {
+                UILogTabCloseButton *pCloseButton = new UILogTabCloseButton(0, pTab->machineId());
+                pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
+                pTabBar->setTabButton(i, QTabBar::RightSide, pCloseButton);
+                connect(pCloseButton, &UILogTabCloseButton::clicked, this, &UIVMLogViewerWidget::sltTabCloseButtonClick);
+            }
         }
         else
@@ -676 +686 @@
 void UIVMLogViewerWidget::sltTabCloseButtonClick()
 {
-    printf("UIVMLogViewerWidget::sltTabCloseButtonClick\n");
+    UILogTabCloseButton *pButton = qobject_cast<UILogTabCloseButton*>(sender());
+    if (!pButton)
+        return;
+    if (pButton->machineId().isNull())
+        return;
+    QVector<QUuid> list;
+    list << pButton->machineId();
+    removeLogViewerPages(list);
 }