Changeset 77087 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2019 7:05:53 PM (6 years ago)

Author:

vboxsync

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

128540

Message:

FE/Qt: bugref:9072 RIP 'filtered' watermarking.

Location:

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

Files:

• UIVMLogViewerSearchPanel.cpp (modified) (1 diff)
• UIVMLogViewerTextEdit.cpp (modified) (5 diffs)
• UIVMLogViewerTextEdit.h (modified) (1 diff)

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

@@ -162 +162 @@
     }
     m_iSearchPosition = -1;
+    m_iMatchCount = 0;
+    emit sigSearchUpdated();
     clearHighlighting();
 }

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

@@ -224 +224 @@
     setWrapLines(false);
     setReadOnly(true);
-    setBackground();
 }
 
@@ -314 +313 @@
 }
 
-void UIVMLogViewerTextEdit::setBackground()
-{
-    /* Prepare modified standard palette: */
-    QPalette pal = style() ? style()->standardPalette() : palette(); // fallback if no style exist.
-    pal.setColor(QPalette::Inactive, QPalette::Highlight, pal.color(QPalette::Active, QPalette::Highlight));
-    pal.setColor(QPalette::Inactive, QPalette::HighlightedText, pal.color(QPalette::Active, QPalette::HighlightedText));
-
-    /* Paint a string to the background of the text edit to indicate that
-       the text has been filtered */
-    if (m_bShownTextIsFiltered)
-    {
-        /* For 100% scale PM_LargeIconSize is 32px, and since we want ~300x~100 pixmap we take it 9x3: */
-        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
-        int imageW = 8 * iIconMetric;
-        int imageH = 8 * iIconMetric;
-        QImage image(imageW, imageH, QImage::Format_ARGB32_Premultiplied);
-        QColor fillColor(QPalette::Light);
-        fillColor.setAlpha(0);
-        image.fill(fillColor);
-        QPainter painter(&image);
-        painter.translate(0.5 * imageW, 0.5 * imageH);
-        painter.rotate(-45);
-
-        /* Configure the font size and color: */
-        QFont pfont = painter.font();
-        QColor fontColor(QPalette::Dark);
-        fontColor.setAlpha(22);
-        painter.setPen(fontColor);
-        pfont.setBold(true);
-        pfont.setPixelSize(48);
-        painter.setFont(pfont);
-        QRect textRect(- 0.5 * imageW, - 0.5 * imageH, imageW, imageH);
-        painter.drawText(textRect, Qt::AlignCenter | Qt::AlignVCenter, m_strBackgroungText);
-
-        pal.setBrush(QPalette::Base, QBrush(image));
-    }
-
-    /* Apply palette changes finally: */
-    setPalette(pal);
-}
-
 void UIVMLogViewerTextEdit::contextMenuEvent(QContextMenuEvent *pEvent)
 {
@@ -423 +381 @@
 
     /** Draw an overlay with text in it to show the number of search matches: */
-    if (viewport() && m_fShowSearchResultOverlay)
+    if (viewport() && (m_fShowSearchResultOverlay || m_bShownTextIsFiltered))
     {
         QPainter painter(viewport());
@@ -430 +388 @@
         rectColor.setAlpha(200);
 
-        QString strText = QString("%1 %2").arg(QString::number(m_iMatchCount)).arg(UIVMLogViewerWidget::tr("Matches Found"));
+        QString strText;
+        if (m_fShowSearchResultOverlay)
+            strText = QString("%1 %2").arg(QString::number(m_iMatchCount)).arg(UIVMLogViewerWidget::tr("Matches Found"));
+        if (m_bShownTextIsFiltered)
+        {
+            if (!strText.isEmpty())
+                strText.append(" / ");
+            strText.append(UIVMLogViewerWidget::tr("Filtered"));
+        }
         /** Space between the text and rectangle border. */
         QSize textMargin(5, 5);
@@ -563 +529 @@
         return;
     m_bShownTextIsFiltered = warning;
-    setBackground();
+    if (viewport())
+        viewport()->repaint();
 }
 

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

@@ -97 +97 @@
     /** If bookmark exists this function removes it, if not it adds the bookmark. */
     void toggleBookmark(const QPair<int, QString>& bookmark);
-    void setBackground();
 
     /** Line number and text at the context menu position */