Changeset 89607 in vbox

Timestamp:

Jun 10, 2021 4:04:00 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Some more fixes about the tab closing stuff

Location:

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

Files:

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

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

@@ -155 +155 @@
     :QTabBar(pParent)
 {
-    setContextMenuPolicy(Qt::CustomContextMenu);
 }
 
@@ -312 +311 @@
         {
             pTabBar->setTabData(i, true);
-            UIVMLogTab *pTab = logTab(i);
-            if (pTab)
+            /* Add close button only for manager UI. */
+            if (uiCommon().uiType() == UICommon::UIType_SelectorUI)
             {
-                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);
+                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);
+                }
             }
         }
@@ -650 +653 @@
     }
     saveOptions();
-}
-
-void UIVMLogViewerWidget::sltShowTabBarContextMenu(const QPoint &pos)
-{
-    if (m_pTabWidget && m_pTabWidget->tabBar())
-    {
-        int iIndex = m_pTabWidget->tabBar()->tabAt(pos);
-        if (iIndex == -1)
-            return;
-        UIVMLogTab *pTab = qobject_cast<UIVMLogTab*>(m_pTabWidget->widget(iIndex));
-        if (!pTab)
-            return;
-        QMenu menu;
-
-        QAction *pCloseAction = menu.addAction(QString("%1 %2").arg(tr("Close Logs of")).arg(pTab->machineName()));
-        pCloseAction->setData(pTab->machineId());
-        connect(pCloseAction, &QAction::triggered, this, &UIVMLogViewerWidget::sltCloseMachineLogs);
-        menu.exec(m_pTabWidget->tabBar()->mapToGlobal(pos));
-    }
 }
 
@@ -766 +750 @@
             m_pMainLayout->addWidget(m_pTabWidget);
             connect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltCurrentTabChanged);
-            connect(m_pTabWidget->tabBar(), &QTabBar::customContextMenuRequested,
-                    this, &UIVMLogViewerWidget::sltShowTabBarContextMenu);
         }
 

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

@@ -142 +142 @@
         void sltResetOptionsToDefault();
     /** @} */
-    void sltShowTabBarContextMenu(const QPoint &pos);
     void sltCloseMachineLogs();
     void sltTabCloseButtonClick();