Changeset 95069 in vbox

Timestamp:

May 24, 2022 9:40:04 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Make changes so that we attempt to open external links in the default browser.

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (1 diff)
• UIHelpBrowserWidget.h (modified) (1 diff)
• UIHelpViewer.cpp (modified) (3 diffs)

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

@@ -1951 +1951 @@
 void UIHelpBrowserWidget::sltLinkHighlighted(const QUrl &url)
 {
-    emit sigStatusBarMessage(url.url(), 0); /** @todo qt6: ??? */
+    QString strMessage = url.url();
+    if (url.scheme() != "qthelp")
+        strMessage = QString("%1: %2").arg(tr("Click to open this link in an external browser")).arg(url.url());
+
+    emit sigStatusBarMessage(strMessage, 0); /** @todo qt6: ??? */
 }
 #else
 void UIHelpBrowserWidget::sltLinkHighlighted(const QString &strLink)
 {
-    emit sigStatusBarMessage(strLink, 0);
+    QString strMessage = strLink;
+    if (QUrl(strLink).scheme() != "qthelp")
+        strMessage = QString("%1: %2").arg(tr("Click to open this link in an external browser")).arg(strLink);
+
+    emit sigStatusBarMessage(strMessage, 0);
 }
 #endif

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

@@ -64 +64 @@
     void sigAddBookmark();
     void sigStatusBarMessage(const QString &strMessage, int iTimeOut);
+
 public:
 

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

@@ -463 +463 @@
 {
     clearOverlay();
+    if (url.scheme() != "qthelp")
+        return;
 #ifdef VBOX_IS_QT6_OR_LATER
     QTextBrowser::doSetSource(url, type);
@@ -699 +701 @@
 
     QString strAnchor = anchorAt(pEvent->pos());
+
     if (!strAnchor.isEmpty())
     {
+
+        QString strLink = source().resolved(strAnchor).toString();
+
+        if (source().resolved(strAnchor).scheme() != "qthelp" && pEvent->button() == Qt::LeftButton)
+        {
+            uiCommon().openURL(strLink);
+            return;
+        }
+
         if ((pEvent->modifiers() & Qt::ControlModifier) ||
             pEvent->button() == Qt::MiddleButton)
         {
-            QString strLink = source().resolved(strAnchor).toString();
+
             emit sigOpenLinkInNewTab(strLink, true);
             return;
@@ -907 +919 @@
     QUrl url = pSender->data().toUrl();
     if (url.isValid())
-        QTextBrowser::setSource(url);
+        setSource(url);
 }