Changeset 88423 in vbox for trunk

Timestamp:

Apr 8, 2021 6:08:52 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Implementing click and enlarge thingy

Location:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser

Files:

• UIHelpBrowserWidget.cpp (modified) (7 diffs)
• UIHelpViewer.cpp (modified) (8 diffs)
• UIHelpViewer.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -203 +203 @@
     int zoomPercentage() const;
     void setZoomPercentage(int iZoomPercentage);
+    void setHelpFileList(const QList<QUrl> &helpFileList);
 
 private slots:
@@ -276 +277 @@
     /** Sets the zoom percentage of all tabs. */
     void setZoomPercentage(int iZoomPercentage);
+    void setHelpFileList(const QList<QUrl> &helpFileList);
 
 public slots:
@@ -318 +320 @@
     bool m_fToolBarVisible;
     QStringList m_tabTitleList;
+    QList<QUrl> m_helpFileList;
 };
 
@@ -586 +589 @@
     if (m_pContentViewer)
         m_pContentViewer->setZoomPercentage(iZoomPercentage);
+}
+
+void UIHelpBrowserTab::setHelpFileList(const QList<QUrl> &helpFileList)
+{
+    if (m_pContentViewer)
+        m_pContentViewer->setHelpFileList(helpFileList);
 }
 
@@ -836 +845 @@
 
     pTabWidget->setZoomPercentage(zoomPercentage());
+    pTabWidget->setHelpFileList(m_helpFileList);
 
     if (!fBackground)
@@ -1017 +1027 @@
 }
 
+void UIHelpBrowserTabManager::setHelpFileList(const QList<QUrl> &helpFileList)
+{
+    m_helpFileList = helpFileList;
+}
 
 void UIHelpBrowserTabManager::sltHandletabTitleChange(const QString &strTitle)
@@ -1299 +1313 @@
     m_pTabWidget = new QITabWidget;
     m_pTabManager = new UIHelpBrowserTabManager(m_pHelpEngine, findIndexHtml(), loadSavedUrlList());
+    m_pTabManager->setHelpFileList(m_pHelpEngine->files(m_pHelpEngine->namespaceName(m_strHelpFilePath), QStringList()));
 
     AssertReturnVoid(m_pTabWidget &&

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

@@ -30 +30 @@
 #include <QMenu>
 #include <QHBoxLayout>
+#include <QGraphicsBlurEffect>
+#include <QLabel>
+#include <QPainter>
 #include <QScrollBar>
 #include <QTextBlock>
@@ -342 +345 @@
     , m_iSearchTermLength(0)
     , m_iZoomPercentage(100)
+    , m_fImageOverlay(false)
+    , m_pOverlayWidget(0)
+    , m_pOverlayLabel(0)
 {
     m_iInitialFontPointSize = font().pointSize();
@@ -357 +363 @@
             this, &UIHelpViewer::sigCloseFindInPageWidget);
 
+    m_defaultCursor = cursor();
+    m_handCursor = QCursor(Qt::PointingHandCursor);
+
     m_pFindInPageWidget->setVisible(false);
+
+
+    m_pOverlayWidget = new QWidget(this);
+    QHBoxLayout *overlayLayout = new QHBoxLayout(m_pOverlayWidget);
+    m_pOverlayLabel = new QLabel;
+    overlayLayout->addWidget(m_pOverlayLabel);
+    m_pOverlayWidget->hide();
+
+    m_pOverlayBlurEffect = new QGraphicsBlurEffect(this);
+    viewport()->setGraphicsEffect(m_pOverlayBlurEffect);
+    m_pOverlayBlurEffect->setEnabled(false);
+    m_pOverlayBlurEffect->setBlurRadius(8);
     retranslateUi();
 }
@@ -468 +489 @@
 }
 
+void UIHelpViewer::setHelpFileList(const QList<QUrl> &helpFileList)
+{
+    m_helpFileList = helpFileList;
+}
 
 int UIHelpViewer::zoomPercentage() const
@@ -546 +571 @@
 void UIHelpViewer::wheelEvent(QWheelEvent *pEvent)
 {
+    if (m_fImageOverlay)
+        return;
+
     /* QTextBrowser::wheelEvent scales font when some modifiers are pressed. We dont want: */
     if (pEvent && pEvent->modifiers() == Qt::NoModifier)
@@ -553 +581 @@
 void UIHelpViewer::mousePressEvent(QMouseEvent *pEvent)
 {
+    if (m_fImageOverlay)
+        clearOverlay();
+
+    QIWithRetranslateUI<QTextBrowser>::mousePressEvent(pEvent);
+
     QString strAnchor = anchorAt(pEvent->pos());
     if (!strAnchor.isEmpty())
@@ -563 +596 @@
         }
     }
-    QIWithRetranslateUI<QTextBrowser>::mousePressEvent(pEvent);
+
+    loadImageAtPosition(pEvent->globalPos());
+}
+
+void UIHelpViewer::mouseMoveEvent(QMouseEvent *pEvent)
+{
+    if (m_fImageOverlay)
+        return;
+
+    QIWithRetranslateUI<QTextBrowser>::mouseMoveEvent(pEvent);
+
+    QPoint viewportCoordinates = viewport()->mapFromGlobal(pEvent->globalPos());
+    QTextCursor cursor = cursorForPosition(viewportCoordinates);
+    if (cursor.charFormat().isImageFormat())
+        viewport()->setCursor(m_handCursor);
+    else
+        viewport()->setCursor(m_defaultCursor);
+}
+
+void UIHelpViewer::mouseDoubleClickEvent(QMouseEvent *pEvent)
+{
+    if (m_fImageOverlay)
+        clearOverlay();
+
+    QIWithRetranslateUI<QTextBrowser>::mouseDoubleClickEvent(pEvent);
+}
+
+void UIHelpViewer::paintEvent(QPaintEvent *pEvent)
+{
+    QIWithRetranslateUI<QTextBrowser>::paintEvent(pEvent);
+    // if (m_pOverlayBlurEffect && m_pOverlayBlurEffect->isEnabled())
+    //     m_pOverlayBlurEffect->setEnabled(false);
+
+    if (m_pOverlayLabel && m_pOverlayWidget)
+    {
+        if (m_fImageOverlay)
+        {
+
+            // QPainter painter(viewport());
+            // painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform);
+            QSize size(0.8 * width(), 0.8 * height());
+            m_pOverlayLabel->setPixmap(m_overlayPixmap.scaled(size,  Qt::KeepAspectRatio, Qt::SmoothTransformation));
+            m_pOverlayWidget->move(0.1 * width(), 0.1 * height());
+            m_pOverlayWidget->show();
+            // QRect rect(10, 10, 0.4 * width() - 20, height() - 20);
+            // painter.drawPixmap(rect, m_overlayPixmap);
+            //painter.fillRect(rect, Qt::red);
+        }
+        else
+            m_pOverlayWidget->hide();
+
+    }
 }
 
@@ -776 +860 @@
 }
 
+void UIHelpViewer::clearOverlay()
+{
+    m_overlayPixmap = QPixmap();
+    m_fImageOverlay = false;
+    if (m_pOverlayBlurEffect)
+        m_pOverlayBlurEffect->setEnabled(false);
+}
+
+void UIHelpViewer::loadImageAtPosition(const QPoint &globalPosition)
+{
+    clearOverlay();
+    QPoint viewportCoordinates = viewport()->mapFromGlobal(globalPosition);
+    QTextCursor cursor = cursorForPosition(viewportCoordinates);
+    if (!cursor.charFormat().isImageFormat())
+        return;
+
+    QTextImageFormat imageFormat = cursor.charFormat().toImageFormat();
+    QUrl imageFileUrl;
+    foreach (const QUrl &fileUrl, m_helpFileList)
+    {
+        if (fileUrl.toString().contains(imageFormat.name(), Qt::CaseInsensitive))
+        {
+            imageFileUrl = fileUrl;
+            break;
+        }
+    }
+
+    if (!imageFileUrl.isValid())
+        return;
+    QByteArray fileData = m_pHelpEngine->fileData(imageFileUrl);
+    if (!fileData.isEmpty())
+    {
+        m_overlayPixmap.loadFromData(fileData,"PNG");
+        if (!m_overlayPixmap.isNull())
+        {
+            m_fImageOverlay = true;
+            if (m_pOverlayBlurEffect)
+                m_pOverlayBlurEffect->setEnabled(true);
+            viewport()->setCursor(m_defaultCursor);
+        }
+    }
+}
 
 #include "UIHelpViewer.moc"

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.h

@@ -30 +30 @@
 /* Forward declarations: */
 class QHelpEngine;
+class QGraphicsBlurEffect;
+class QLabel;
 class UIFindInPageWidget;
 
@@ -69 +71 @@
     int zoomPercentage() const;
     void setZoomPercentage(int iZoomPercentage);
+    void setHelpFileList(const QList<QUrl> &helpFileList);
 
     static const QPair<int, int> zoomPercentageMinMax;
@@ -82 +85 @@
     virtual void wheelEvent(QWheelEvent *pEvent) /* override */;
     virtual void mousePressEvent(QMouseEvent *pEvent) /* override */;
+    virtual void mouseMoveEvent(QMouseEvent *pEvent) /* override */;
+    virtual void mouseDoubleClickEvent(QMouseEvent *pEvent) /* override */;
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
 
 private slots:
@@ -110 +116 @@
     void scaleFont();
     void scaleImages();
+    /** If there is image at @p globalPosition then its data is loaded to m_overlayPixmap. */
+    void loadImageAtPosition(const QPoint &globalPosition);
+    void clearOverlay();
+
     const QHelpEngine* m_pHelpEngine;
     UIFindInPageWidget *m_pFindInPageWidget;
@@ -124 +134 @@
     /** As percentage. */
     int m_iZoomPercentage;
+    QCursor m_defaultCursor;
+    QCursor m_handCursor;
+    QList<QUrl> m_helpFileList;
+    QPixmap m_overlayPixmap;
+    bool m_fImageOverlay;
+
+    QWidget *m_pOverlayWidget;
+    QLabel *m_pOverlayLabel;
+    QGraphicsBlurEffect *m_pOverlayBlurEffect;
 };