Changeset 89011 in vbox

Timestamp:

May 12, 2021 12:53:25 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Label tab fixes

Location:

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

Files:

• UIVMLogPage.cpp (modified) (2 diffs)
• UIVMLogPage.h (modified) (4 diffs)
• UIVMLogViewerWidget.cpp (modified) (16 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

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

@@ -31 +31 @@
 #include "UIVMLogViewerTextEdit.h"
 
-
-UIVMLogPage::UIVMLogPage(QWidget *pParent /* = 0 */)
+/*********************************************************************************************************************************
+*   UIVMLogTab implementation.                                                                                        *
+*********************************************************************************************************************************/
+
+UIVMLogTab::UIVMLogTab(QWidget *pParent, const QUuid &uMachineId)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_uMachineId(uMachineId)
+{
+}
+const QUuid &UIVMLogTab::machineId() const
+{
+    return m_uMachineId;
+}
+
+/*********************************************************************************************************************************
+*   UIVMLogPage implementation.                                                                                        *
+*********************************************************************************************************************************/
+
+UIVMLogPage::UIVMLogPage(QWidget *pParent, const QUuid &uMachineId)
+    : UIVMLogTab(pParent, uMachineId)
     , m_pMainLayout(0)
     , m_pTextEdit(0)
@@ -310 +327 @@
 }
 
-const QUuid &UIVMLogPage::machineId() const
-{
-    return m_machineId;
-}
-
-void UIVMLogPage::setMachineId(const QUuid &machineId)
-{
-    m_machineId = machineId;
-}
-
 void UIVMLogPage::setLogFileId(int iLogFileId)
 {

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

@@ -41 +41 @@
 typedef QPair<int, QString> LogBookmark;
 
+
+class UIVMLogTab : public QIWithRetranslateUI<QWidget>
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIVMLogTab(QWidget *pParent, const QUuid &uMachineId);
+    const QUuid &machineId() const;
+
+private:
+
+    QUuid m_uMachineId;
+};
+
 /** UIVMLogPage defines data and functionalities of the each tab page of a UIVMLogViewerWidget.
  *  It stores the original log file content , a list of bookmarks, etc */
-class UIVMLogPage  : public QIWithRetranslateUI<QWidget>
+class UIVMLogPage  : public UIVMLogTab
 {
     Q_OBJECT;
@@ -54 +70 @@
 public:
 
-    UIVMLogPage(QWidget *pParent = 0);
+    UIVMLogPage(QWidget *pParent, const QUuid &uMachineId);
     ~UIVMLogPage();
 
@@ -95 +111 @@
     QFont currentFont() const;
     void setCurrentFont(QFont font);
-
-    const QUuid &machineId() const;
-    void setMachineId(const QUuid &machineId);
 
     void setLogFileId(int iLogFileId);
@@ -142 +155 @@
         bool           m_bFiltered;
     /** @} */
-    /** Id of the machine the log shown in this page belongs to. */
-    QUuid m_machineId;
     /** The id we pass to CMachine::ReadLog. Used while refreshing and saving page content. */
     int m_iLogFileId;

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

@@ -61 +61 @@
 const ULONG uAllowedLogSize = _256M;
 
-class UILabelTab : public QWidget
-{
+class UILabelTab : public UIVMLogPage
+{
+
     Q_OBJECT;
 
@@ -68 +69 @@
 
     UILabelTab(QWidget *pParent, const QUuid &uMachineId)
-        : QWidget(pParent)
-        , m_uMachineId(uMachineId)
-    {
-    }
-
-private:
-
-    QUuid m_uMachineId;
-
+        : UIVMLogPage(pParent, uMachineId)
+    {
+    }
 };
 
@@ -91 +86 @@
 
     UITabBar(QWidget *pParent = 0);
+
 protected:
 
     virtual void paintEvent(QPaintEvent *pEvent) /* override */;
-
-private:
-
-    QVector<QColor> m_alternateColors;
-    QColor m_selectedTabColor;
 };
 
@@ -123 +114 @@
     :QTabBar(pParent)
 {
-    QStyleOptionTab opt;
-    m_alternateColors << opt.palette.color(QPalette::Button).darker(180);
-    m_alternateColors << opt.palette.color(QPalette::Button).darker(120);
-    m_selectedTabColor = opt.palette.color(QPalette::Button).lighter(300);
-
-    // QStyle *pFusionStyle = QStyleFactory::create("Fusion");
-    // if (pFusionStyle)
-    //     setStyle(pFusionStyle);
 }
 
@@ -144 +127 @@
         initStyleOption(&opt, i);
         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);
@@ -266 +242 @@
     removeLogViewerPages(unselectedMachines);
     /* Assign color indexes to tabs based on machines. We use two alternating colors to indicate different machine logs. */
-    setTabColorPerMachine();
+    markLabelTabs();
+    labelTabHandler();
     m_pTabWidget->show();
 }
 
-void UIVMLogViewerWidget::setTabColorPerMachine()
+void UIVMLogViewerWidget::markLabelTabs()
 {
     if (!m_pTabWidget || !m_pTabWidget->tabBar() || m_pTabWidget->tabBar()->count() == 0)
         return;
     QTabBar *pTabBar = m_pTabWidget->tabBar();
-    //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);
@@ -390 +358 @@
 
     m_pTabWidget->blockSignals(false);
-    setTabColorPerMachine();
+    markLabelTabs();
     m_pTabWidget->show();
 }
@@ -922 +890 @@
 }
 
-void UIVMLogViewerWidget::createLogPage(const QString &strFileName, const QString &strMachineName,
+void UIVMLogViewerWidget::createLogPage(const QString &strFileName,
                                         const QUuid &machineId, int iLogFileId,
                                         const QString &strLogContent, bool noLogsToShow)
@@ -930 +898 @@
 
     /* Create page-container: */
-    UIVMLogPage* pLogPage = new UIVMLogPage(this);
+    UIVMLogPage* pLogPage = new UIVMLogPage(this, machineId);
     if (pLogPage)
     {
@@ -939 +907 @@
         pLogPage->setWrapLines(m_bWrapLines);
         pLogPage->setCurrentFont(m_font);
-        pLogPage->setMachineId(machineId);
         pLogPage->setLogFileId(iLogFileId);
         /* Set the file name only if we really have log file to read. */
@@ -945 +912 @@
             pLogPage->setLogFileName(strFileName);
 
-        /* Add page-container to viewer-container in stacked mode (manager UI case): */
-        bool fTitleWithMachineName = false;//m_enmEmbedding == EmbedTo_Stack;
-        QString strTabTitle;
-        if (fTitleWithMachineName)
-        {
-            strTabTitle.append(strMachineName);
-            strTabTitle.append(" - ");
-        }
-        strTabTitle.append(QFileInfo(strFileName).fileName());
-
-        int iIndex = m_pTabWidget->addTab(pLogPage, strTabTitle);
+        int iIndex = m_pTabWidget->addTab(pLogPage, QFileInfo(strFileName).fileName());
         /* !!Hack alert. Setting html to text edit while th tab is not current ends up in an empty text edit: */
         if (noLogsToShow)
@@ -1003 +960 @@
         QString strMachineName = comMachine.GetName();
 
-        m_pTabWidget->addTab(new UILabelTab(this, uMachineId), strMachineName);
+        if (m_enmEmbedding == EmbedTo_Stack)
+            m_pTabWidget->addTab(new UILabelTab(this, uMachineId), strMachineName);
 
         bool fNoLogFileForMachine = true;
@@ -1013 +971 @@
                 fNoLogFileForMachine = false;
                 createLogPage(comMachine.QueryLogFilename(iLogFileId),
-                              strMachineName, uMachineId, iLogFileId,
+                              uMachineId, iLogFileId,
                               strLogContent, false);
             }
@@ -1023 +981 @@
                                                  "<nobr><b>%2</b></nobr>.</p>")
                                               .arg(strMachineName).arg(comMachine.GetLogFolder()));
-            createLogPage(tr("NoLogFile"), strMachineName, uMachineId, -1 /* iLogFileId */, strDummyTabText, true);
+            createLogPage(tr("NoLogFile"), uMachineId, -1 /* iLogFileId */, strDummyTabText, true);
         }
     }
@@ -1037 +995 @@
     m_pTabWidget->blockSignals(true);
     /* Cache log page pointers and tab titles: */
-    QVector<QPair<UIVMLogPage*, QString> > logPages;
+    QVector<QPair<UIVMLogTab*, QString> > logTabs;
     for (int i = 0; i < m_pTabWidget->count(); ++i)
     {
-        UIVMLogPage *pTab = logPage(i);
+        UIVMLogTab *pTab = logPage(i);
         if (pTab)
-            logPages << QPair<UIVMLogPage*, QString>(pTab, m_pTabWidget->tabText(i));
+            logTabs << QPair<UIVMLogTab*, QString>(pTab, m_pTabWidget->tabText(i));
     }
     /* Remove all the tabs from tab widget, note that this does not delete tab widgets: */
     m_pTabWidget->clear();
-    QVector<UIVMLogPage*> pagesToRemove;
+    QVector<UIVMLogTab*> pagesToRemove;
     /* Add tab widgets (log pages) back as long as machine id is not in machineList: */
-    for (int i = 0; i < logPages.size(); ++i)
-    {
-        if (!logPages[i].first)
+    for (int i = 0; i < logTabs.size(); ++i)
+    {
+        if (!logTabs[i].first)
             continue;
-        const QUuid &id = logPages[i].first->machineId();
+        const QUuid &id = logTabs[i].first->machineId();
 
         if (machineList.contains(id))
-            pagesToRemove << logPages[i].first;
+            pagesToRemove << logTabs[i].first;
         else
-            m_pTabWidget->addTab(logPages[i].first, logPages[i].second);
+            m_pTabWidget->addTab(logTabs[i].first, logTabs[i].second);
     }
     /* Delete all the other pages: */
@@ -1069 +1027 @@
         return;
 
-    QVector<UIVMLogPage*> pagesToRemove = logPages();
+    QVector<QWidget*> pagesToRemove;
+    for (int i = 0; i < m_pTabWidget->count(); ++i)
+        pagesToRemove << m_pTabWidget->widget(i);
     m_pTabWidget->clear();
     qDeleteAll(pagesToRemove.begin(), pagesToRemove.end());

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

@@ -172 +172 @@
 
     /** Returns the newly created log-page using @a strPage filename. */
-    void createLogPage(const QString &strFileName, const QString &strMachineName,
+    void createLogPage(const QString &strFileName,
                        const QUuid &machineId, int iLogFileId,
                        const QString &strLogContent, bool noLogsToShow);
@@ -187 +187 @@
     void removeLogViewerPages(const QVector<QUuid> &machineList);
     void removeAllLogPages();
-    /** We alternate tab colors between two `darker and lighter` one per machine. This function goes over tabs and
-      * sets tab data so tab our QTabBar extension can color tabs correctly. */
-    void setTabColorPerMachine();
+    void markLabelTabs();
 
     /** Resets document (of the curent tab) and scrollbar highligthing */