Changeset 89586 in vbox

Timestamp:

Jun 9, 2021 4:53:46 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Adding a context menu to logviewer tabbar

Location:

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

Files:

• UIVMLogPage.cpp (modified) (3 diffs)
• UIVMLogPage.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (9 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

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

@@ -35 +35 @@
 *********************************************************************************************************************************/
 
-UIVMLogTab::UIVMLogTab(QWidget *pParent, const QUuid &uMachineId)
+UIVMLogTab::UIVMLogTab(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_uMachineId(uMachineId)
+    , m_strMachineName(strMachineName)
 {
 }
@@ -43 +44 @@
 {
     return m_uMachineId;
+}
+
+const QString UIVMLogTab::machineName() const
+{
+    return m_strMachineName;
 }
 
@@ -49 +55 @@
 *********************************************************************************************************************************/
 
-UIVMLogPage::UIVMLogPage(QWidget *pParent, const QUuid &uMachineId)
-    : UIVMLogTab(pParent, uMachineId)
+UIVMLogPage::UIVMLogPage(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName)
+    : UIVMLogTab(pParent, uMachineId, strMachineName)
     , m_pMainLayout(0)
     , m_pTextEdit(0)

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

@@ -49 +49 @@
 public:
 
-    UIVMLogTab(QWidget *pParent, const QUuid &uMachineId);
+    UIVMLogTab(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName);
     const QUuid &machineId() const;
+    const QString machineName() const;
 
 private:
 
     QUuid m_uMachineId;
+    QString m_strMachineName;
 };
 
@@ -70 +72 @@
 public:
 
-    UIVMLogPage(QWidget *pParent, const QUuid &uMachineId);
+    UIVMLogPage(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName);
     ~UIVMLogPage();
 

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

@@ -67 +67 @@
 public:
 
-    UILabelTab(QWidget *pParent, const QUuid &uMachineId)
-        : UIVMLogPage(pParent, uMachineId)
+    UILabelTab(QWidget *pParent, const QUuid &uMachineId, const QString &strMachineName)
+        : UIVMLogPage(pParent, uMachineId, strMachineName)
     {
     }
@@ -113 +113 @@
     :QTabBar(pParent)
 {
+    setContextMenuPolicy(Qt::CustomContextMenu);
 }
 
@@ -598 +599 @@
 }
 
+void UIVMLogViewerWidget::sltShowTabBarContextMenu(const QPoint &pos)
+{
+    if (m_pTabWidget && m_pTabWidget->tabBar())
+    {
+        QMenu menu;
+        menu.addAction(tr("Close Other Tabs"));
+        menu.exec(m_pTabWidget->tabBar()->mapToGlobal(pos));
+    }
+}
+
 void UIVMLogViewerWidget::prepare()
 {
@@ -668 +679 @@
             m_pMainLayout->addWidget(m_pTabWidget);
             connect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltCurrentTabChanged);
+            connect(m_pTabWidget->tabBar(), &QTabBar::customContextMenuRequested,
+                    this, &UIVMLogViewerWidget::sltShowTabBarContextMenu);
         }
 
@@ -904 +917 @@
 
 void UIVMLogViewerWidget::createLogPage(const QString &strFileName,
+                                        const QString &strMachineName,
                                         const QUuid &machineId, int iLogFileId,
                                         const QString &strLogContent, bool noLogsToShow)
@@ -911 +925 @@
 
     /* Create page-container: */
-    UIVMLogPage* pLogPage = new UIVMLogPage(this, machineId);
+    UIVMLogPage* pLogPage = new UIVMLogPage(this, machineId, strMachineName);
     if (pLogPage)
     {
@@ -974 +988 @@
 
         if (uiCommon().uiType() == UICommon::UIType_SelectorUI)
-            m_pTabWidget->addTab(new UILabelTab(this, uMachineId), strMachineName);
+            m_pTabWidget->addTab(new UILabelTab(this, uMachineId, strMachineName), strMachineName);
 
         bool fNoLogFileForMachine = true;
@@ -984 +998 @@
                 fNoLogFileForMachine = false;
                 createLogPage(comMachine.QueryLogFilename(iLogFileId),
+                              strMachineName,
                               uMachineId, iLogFileId,
                               strLogContent, false);
@@ -994 +1009 @@
                                                  "<nobr><b>%2</b></nobr>.</p>")
                                               .arg(strMachineName).arg(comMachine.GetLogFolder()));
-            createLogPage(tr("NoLogFile"), uMachineId, -1 /* iLogFileId */, strDummyTabText, true);
+            createLogPage(tr("NoLogFile"), strMachineName, uMachineId, -1 /* iLogFileId */, strDummyTabText, true);
         }
     }

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

@@ -141 +141 @@
         void sltResetOptionsToDefault();
     /** @} */
+    void sltShowTabBarContextMenu(const QPoint &pos);
 
 private:
@@ -175 +176 @@
     /** Returns the newly created log-page using @a strPage filename. */
     void createLogPage(const QString &strFileName,
+                       const QString &strMachineName,
                        const QUuid &machineId, int iLogFileId,
                        const QString &strLogContent, bool noLogsToShow);