Changeset 104576 in vbox

Timestamp:

May 10, 2024 1:42:38 PM (9 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:9831. Some fixes on URL handling.

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (2 diffs)
• UIHelpViewer.cpp (modified) (3 diffs)
• UIHelpViewer.h (modified) (2 diffs)

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

@@ -1930 +1930 @@
 void UIHelpBrowserWidget::sltLinkHighlighted(const QUrl &url)
 {
+    if (url.isEmpty())
+    {
+        emit sigStatusBarMessage("", 0);
+        return;
+    }
+
     QString strMessage = url.url();
-    if (url.scheme() != "qthelp")
-        strMessage = QString("%1: %2").arg(tr("Click to open this link in an external browser")).arg(strMessage);
-
+    if (url.scheme() == "https" || url.scheme() == "http")
+        strMessage = QString("%1: %2").arg(tr("Click to open the following URL with an external browser")).arg(strMessage);
+    else if (url.scheme() == "qthelp")
+        strMessage = QString("%1: %2").arg(tr("Click to navigate to internal URL")).arg(strMessage);
+    else
+        strMessage = "";
     emit sigStatusBarMessage(strMessage, 0);
 }
@@ -2081 +2090 @@
     QMenu menu;
     QAction *pOpen = menu.addAction(tr("Open Link"));
-    QAction *pOpenInNewTab = menu.addAction(tr("Open Link in New Tab"));
+    if (url.scheme() == "qthelp")
+    {
+        QAction *pOpenInNewTab = menu.addAction(tr("Open Link in New Tab"));
+        pOpenInNewTab->setData(url);
+        pOpenInNewTab->setEnabled(fURLValid);
+        connect(pOpenInNewTab, &QAction::triggered, this, &UIHelpBrowserWidget::sltOpenLinkInNewTab);
+    }
     QAction *pCopyLink = menu.addAction(tr("Copy Link"));
 
     pOpen->setData(url);
-    pOpenInNewTab->setData(url);
     pCopyLink->setData(url);
 
     pOpen->setEnabled(fURLValid);
-    pOpenInNewTab->setEnabled(fURLValid);
     pCopyLink->setEnabled(fURLValid);
 
-    connect(pOpenInNewTab, &QAction::triggered, this, &UIHelpBrowserWidget::sltOpenLinkInNewTab);
     connect(pOpen, &QAction::triggered, this, &UIHelpBrowserWidget::sltOpenLink);
     connect(pCopyLink, &QAction::triggered, this, &UIHelpBrowserWidget::sltCopyLink);

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

@@ -417 +417 @@
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigClose,
             this, &UIHelpViewer::sltCloseFindInPageWidget);
+    connect(this, &UIHelpViewer::highlighted,
+            this, &UIHelpViewer::sltUpdateHighlightedURL);
 
     m_pFindInPageWidget->setVisible(false);
@@ -513 +515 @@
 {
     sltToggleFindInPageWidget(false);
+}
+
+void UIHelpViewer::sltUpdateHighlightedURL(const QUrl &url)
+{
+    m_highlightedUrl = url;
 }
 
@@ -607 +614 @@
     menu.addAction(pFindInPage);
 
-    QString strAnchor = anchorAt(event->pos());
-    if (!strAnchor.isEmpty())
-    {
-        QString strLink = source().resolved(anchorAt(event->pos())).toString();
+    if (!m_highlightedUrl.isEmpty())
+    {
+        QString strLink = m_highlightedUrl.toString();
         pOpenLinkAction->setData(strLink);
         pOpenInNewTabAction->setData(strLink);
         pCopyLink->setData(strLink);
+        if (m_highlightedUrl.scheme() == "https" ||
+            m_highlightedUrl.scheme() == "http")
+            pOpenInNewTabAction->setEnabled(false);
     }
     else

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

@@ -118 +118 @@
     void sltToggleFindInPageWidget(bool fVisible);
     void sltCloseFindInPageWidget();
+    void sltUpdateHighlightedURL(const QUrl &url);
 
 private:
@@ -162 +163 @@
     QGraphicsBlurEffect *m_pOverlayBlurEffect;
     int m_iZoomPercentage;
+    QUrl m_highlightedUrl;
 };