Changeset 89605 in vbox

Timestamp:

Jun 10, 2021 2:39:35 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Adding the clse button to label tab

Location:

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

Files:

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

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

@@ -60 +60 @@
 const ULONG uAllowedLogSize = _256M;
 
+class UILogTabCloseButton : public QIToolButton
+{
+    Q_OBJECT;
+
+public:
+
+    //UILogTabCloseButton(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName);
+    UILogTabCloseButton(QWidget *pParent = 0)
+        : QIToolButton(pParent)
+    {
+        setAutoRaise(true);
+        setIcon(UIIconPool::iconSet(":/close_16px.png"));
+    }
+
+protected:
+
+};
+/*********************************************************************************************************************************
+*   UILabelTab definition.                                                                                        *
+*********************************************************************************************************************************/
+
 class UILabelTab : public UIVMLogTab
 {
@@ -67 +88 @@
 public:
 
-    UILabelTab(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName)
-        : UIVMLogTab(pParent, uMachineId, strMachineName)
-    {
-    }
+    UILabelTab(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName);
 
 protected:
-    void retranslateUi(){}
+
+    void retranslateUi();
 };
 
@@ -108 +127 @@
     UITabWidget(QWidget *pParent = 0);
 };
+
+/*********************************************************************************************************************************
+*   UILabelTab implementation.                                                                                        *
+*********************************************************************************************************************************/
+
+UILabelTab::UILabelTab(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName)
+    : UIVMLogTab(pParent, uMachineId, strMachineName)
+{
+}
+
+void UILabelTab::retranslateUi()
+{
+}
 
 /*********************************************************************************************************************************
@@ -271 +303 @@
     {
         if (qobject_cast<UILabelTab*>(m_pTabWidget->widget(i)))
+        {
             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);
+        }
         else
+        {
             pTabBar->setTabData(i, false);
+        }
+
     }
 }
@@ -630 +672 @@
     machineList << machineId;
     removeLogViewerPages(machineList);
+}
+
+void UIVMLogViewerWidget::sltTabCloseButtonClick()
+{
+    printf("UIVMLogViewerWidget::sltTabCloseButtonClick\n");
 }
 

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

@@ -144 +144 @@
     void sltShowTabBarContextMenu(const QPoint &pos);
     void sltCloseMachineLogs();
+    void sltTabCloseButtonClick();
 
 private: