Changeset 89546 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 7, 2021 12:06:58 PM (4 years ago)

Author:

vboxsync

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

144906

Message:

FE/Qt: bugref:9831. Some fixes for mouse over image case

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (6 diffs)
• UIHelpBrowserWidget.h (modified) (1 diff)
• UIHelpViewer.cpp (modified) (5 diffs)
• UIHelpViewer.h (modified) (2 diffs)

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

@@ -191 +191 @@
     void sigFindInPageWidgetVisibilityChanged(bool fVisible);
     void sigHistoryChanged(bool fBackwardAvailable, bool fForwardAvailable);
+    void sigMouseOverImage(const QString &strImageName);
 
 public:
@@ -271 +272 @@
     void sigFindInPageWidgetVisibilityChanged(bool fVisible);
     void sigHistoryChanged(bool fBackwardAvailable, bool fForwardAvailable);
+    void sigMouseOverImage(const QString &strImageName);
 
 public:
@@ -710 +712 @@
     connect(m_pContentViewer, &UIHelpViewer::sigFindInPageWidgetToogle,
             this, &UIHelpBrowserTab::sltFindInPageWidgetVisibilityChanged);
+    connect(m_pContentViewer, &UIHelpViewer::sigMouseOverImage,
+            this, &UIHelpBrowserTab::sigMouseOverImage);
 
     m_pContentViewer->setSource(initialUrl);
@@ -939 +943 @@
     connect(pTabWidget, &UIHelpBrowserTab::sigHistoryChanged,
             this, &UIHelpBrowserTabManager::sigHistoryChanged);
-
-
-
-    pTabWidget->setZoomPercentage(zoomPercentage());
+   connect(pTabWidget, &UIHelpBrowserTab::sigMouseOverImage,
+            this, &UIHelpBrowserTabManager::sigMouseOverImage);
+
+   pTabWidget->setZoomPercentage(zoomPercentage());
     pTabWidget->setHelpFileList(m_helpFileList);
     setFocusProxy(pTabWidget);
@@ -1575 +1579 @@
     connect(m_pTabManager, &UIHelpBrowserTabManager::sigHistoryChanged,
             this, &UIHelpBrowserWidget::sltHistoryChanged);
-
+    connect(m_pTabManager, &UIHelpBrowserTabManager::sigMouseOverImage,
+            this, &UIHelpBrowserWidget::sltMouseOverImage);
 
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
@@ -1916 +1921 @@
 }
 
+void UIHelpBrowserWidget::sltMouseOverImage(const QString &strImageName)
+{
+    emit sigStatusBarMessage(QString("%1: %2").arg(tr("Click to enlarge the image")).arg(strImageName) , 3000);
+}
+
 void UIHelpBrowserWidget::sltCopyAvailableChanged(bool fAvailable)
 {

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

@@ -111 +111 @@
     void sltHistoryChanged(bool fBackwardAvailable, bool fForwardAvailable);
     void sltLinkHighlighted(const QString &strLink);
+    void sltMouseOverImage(const QString &strImageName);
 
 private:

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

@@ -660 +660 @@
 }
 
-
-void UIHelpViewer::mouseMoveEvent(QMouseEvent *pEvent)
-{
-    if (m_fOverlayMode)
-        return;
-
-    QPoint viewportCoordinates = viewport()->mapFromGlobal(pEvent->globalPos());
+void UIHelpViewer::setImageOverCursor(QPoint globalPosition)
+{
+    QPoint viewportCoordinates = viewport()->mapFromGlobal(globalPosition);
     QTextCursor cursor = cursorForPosition(viewportCoordinates);
     if (!m_fCursorChanged && cursor.charFormat().isImageFormat())
@@ -672 +668 @@
         m_fCursorChanged = true;
         viewport()->setCursor(m_handCursor);
+        emit sigMouseOverImage(cursor.charFormat().toImageFormat().name());
     }
     if (m_fCursorChanged && !cursor.charFormat().isImageFormat())
@@ -678 +675 @@
         m_fCursorChanged = false;
     }
+
+}
+
+void UIHelpViewer::mouseMoveEvent(QMouseEvent *pEvent)
+{
+    if (m_fOverlayMode)
+        return;
+    setImageOverCursor(pEvent->globalPos());
     QIWithRetranslateUI<QTextBrowser>::mouseMoveEvent(pEvent);
 }
@@ -995 +1000 @@
 void UIHelpViewer::clearOverlay()
 {
+    setImageOverCursor(cursor().pos());
+
     if (!m_fOverlayMode)
         return;
@@ -1038 +1045 @@
                 m_pOverlayBlurEffect->setEnabled(true);
             viewport()->setCursor(m_defaultCursor);
+            m_fCursorChanged = false;
             emit sigOverlayModeChanged(true);
             toggleFindInPageWidget(false);

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

@@ -52 +52 @@
     void sigZoomPercentageChanged(int iPercentage);
     void sigOverlayModeChanged(bool fEnabled);
+    void sigMouseOverImage(const QString &strImageName);
 
 public:
@@ -129 +130 @@
     void loadImageAtPosition(const QPoint &globalPosition);
     void clearOverlay();
+    void setImageOverCursor(QPoint globalPosition);
 
     const QHelpEngine* m_pHelpEngine;