Changeset 88972 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 11, 2021 10:20:30 AM (4 years ago)

Author:

vboxsync

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

144309

Message:

FE/Qt: bugref:9930. Adding label tabs per machine

Location:

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

Files:

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

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

@@ -61 +61 @@
 const ULONG uAllowedLogSize = _256M;
 
+class UILabelTab : public QWidget
+{
+    Q_OBJECT;
+
+public:
+
+    UILabelTab(QWidget *pParent, const QUuid &uMachineId)
+        : QWidget(pParent)
+        , m_uMachineId(uMachineId)
+    {
+    }
+
+private:
+
+    QUuid m_uMachineId;
+
+};
+
 /*********************************************************************************************************************************
 *   UITabBar definition.                                                                                        *
@@ -110 +128 @@
     m_selectedTabColor = opt.palette.color(QPalette::Button).lighter(300);
 
-    QStyle *pFusionStyle = QStyleFactory::create("Fusion");
-    if (pFusionStyle)
-        setStyle(pFusionStyle);
+    // QStyle *pFusionStyle = QStyleFactory::create("Fusion");
+    // if (pFusionStyle)
+    //     setStyle(pFusionStyle);
 }
 
@@ -125 +143 @@
         QStyleOptionTab opt;
         initStyleOption(&opt, i);
-
-        if (i == currentIndex())
-            opt.palette.setColor(QPalette::Button, m_selectedTabColor);
-        else
-        {
-            int iColorIndex = tabData(i).toInt();
-            if (iColorIndex >= 0 && iColorIndex <= m_alternateColors.size())
-                opt.palette.setColor(QPalette::Button, m_alternateColors[iColorIndex]);
-        }
-        painter.drawControl(QStyle::CE_TabBarTab, opt);
+        bool fLabelTab = tabData(i).toBool();
+        // if (i == currentIndex())
+        //     opt.palette.setColor(QPalette::Button, m_selectedTabColor);
+        // else
+        // {
+        //     int iColorIndex = tabData(i).toInt();
+        //     if (iColorIndex >= 0 && iColorIndex <= m_alternateColors.size())
+        //         opt.palette.setColor(QPalette::Button, m_alternateColors[iColorIndex]);
+        // }
+        if (!fLabelTab)
+            painter.drawControl(QStyle::CE_TabBarTabShape, opt);
+        painter.drawControl(QStyle::CE_TabBarTabLabel, opt);
     }
 }
@@ -255 +275 @@
         return;
     QTabBar *pTabBar = m_pTabWidget->tabBar();
-    int iColorIndex = 0;
-    pTabBar->setTabData(0, iColorIndex);
-
-    for (int i = 1; i < pTabBar->count(); ++i)
-    {
-        UIVMLogPage *pLogPage = logPage(i);
-        UIVMLogPage *pLogPagePrev = logPage(i - 1);
-        if (!pLogPage || !pLogPagePrev)
-            continue;
-        /* We the machine if the tab is different than that of previous alternate the color index. */
-        if (pLogPage->machineId() != pLogPagePrev->machineId())
-            ++iColorIndex;
-        pTabBar->setTabData(i, iColorIndex % 2);
+    //int iColorIndex = 0;
+
+    for (int i = 0; i < pTabBar->count(); ++i)
+    {
+        // UIVMLogPage *pLogPage = logPage(i);
+        // UIVMLogPage *pLogPagePrev = logPage(i - 1);
+        // if (!pLogPage || !pLogPagePrev)
+        //     continue;
+
+        // /* We the machine if the tab is different than that of previous alternate the color index. */
+        // if (i > 0 && pLogPage->machineId() != pLogPagePrev->machineId())
+        //     ++iColorIndex;
+        if (qobject_cast<UILabelTab*>(m_pTabWidget->widget(i)))
+            pTabBar->setTabData(i, true);
+        else
+            pTabBar->setTabData(i, false);
     }
 }
@@ -482 +505 @@
 {
     Q_UNUSED(tabIndex);
-
+    if (labelTabHandler())
+        return;
     /* Dont refresh the search here as it is refreshed by the filtering mechanism
        which is updated as tab current index changes (see sltFilterApplied): */
@@ -884 +908 @@
 }
 
-QPlainTextEdit* UIVMLogViewerWidget::logPage(int pIndex) const
-{
-    if (m_pTabWidget)
-        return 0;
-    QWidget* pContainer = m_pTabWidget->widget(pIndex);
-    if (!pContainer)
-        return 0;
-    QPlainTextEdit *pBrowser = pContainer->findChild<QPlainTextEdit*>();
-    return pBrowser;
-}
-
 QVector<UIVMLogPage*> UIVMLogViewerWidget::logPages()
 {
@@ -933 +946 @@
 
         /* Add page-container to viewer-container in stacked mode (manager UI case): */
-        bool fTitleWithMachineName = m_enmEmbedding == EmbedTo_Stack;
+        bool fTitleWithMachineName = false;//m_enmEmbedding == EmbedTo_Stack;
         QString strTabTitle;
         if (fTitleWithMachineName)
@@ -942 +955 @@
         strTabTitle.append(QFileInfo(strFileName).fileName());
 
-
-        m_pTabWidget->blockSignals(true);
         int iIndex = m_pTabWidget->addTab(pLogPage, strTabTitle);
         /* !!Hack alert. Setting html to text edit while th tab is not current ends up in an empty text edit: */
         if (noLogsToShow)
             m_pTabWidget->setCurrentIndex(iIndex);
-        m_pTabWidget->blockSignals(false);
 
         pLogPage->setLogContent(strLogContent, noLogsToShow);
         pLogPage->setScrollBarMarkingsVector(m_pSearchPanel->matchLocationVector());
-
     }
 }
@@ -979 +988 @@
 void UIVMLogViewerWidget::createLogViewerPages(const QVector<QUuid> &machineList)
 {
+    if (!m_pTabWidget)
+        return;
+    m_pTabWidget->blockSignals(true);
+
     const CSystemProperties &sys = uiCommon().virtualBox().GetSystemProperties();
     unsigned cMaxLogs = sys.GetLogHistoryCount() + 1 /*VBox.log*/ + 1 /*VBoxHardening.log*/; /** @todo Add api for getting total possible log count! */
@@ -986 +999 @@
         if (comMachine.isNull())
             continue;
-        bool fNoLogFileForMachine = true;
 
         QUuid uMachineId = comMachine.GetId();
         QString strMachineName = comMachine.GetName();
+
+        m_pTabWidget->addTab(new UILabelTab(this, uMachineId), strMachineName);
+
+        bool fNoLogFileForMachine = true;
         for (unsigned iLogFileId = 0; iLogFileId < cMaxLogs; ++iLogFileId)
         {
@@ -1010 +1026 @@
         }
     }
+    m_pTabWidget->blockSignals(false);
+    labelTabHandler();
 }
 
@@ -1118 +1136 @@
 }
 
+bool UIVMLogViewerWidget::labelTabHandler()
+{
+    if (!m_pTabWidget || !qobject_cast<UILabelTab*>(m_pTabWidget->currentWidget()))
+        return false;
+    if (m_pTabWidget->currentIndex() < m_pTabWidget->count() - 1)
+        m_pTabWidget->setCurrentIndex(m_pTabWidget->currentIndex() + 1);
+    return true;
+}
+
 #include "UIVMLogViewerWidget.moc"

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

@@ -171 +171 @@
     /** @} */
 
-
-    /** Returns the log-page from the tab with index @a pIndex. */
-    QPlainTextEdit* logPage(int pIndex) const;
     /** Returns the newly created log-page using @a strPage filename. */
     void createLogPage(const QString &strFileName, const QString &strMachineName,
@@ -207 +204 @@
     /** Returns the content of the ith log file of @comMachine or possibly an empty string */
     QString readLogFile(CMachine &comMachine, int iLogFileId);
+    /** If the current tab is a label tab then switch to the next tab and return true. Returns false otherwise. */
+    bool labelTabHandler();
 
     /** Holds the widget's embedding type. */