Changeset 86879 in vbox

Timestamp:

Nov 12, 2020 7:17:21 PM (4 years ago)

Author:

vboxsync

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

141340

Message:

FE/Qt: bugref:9831. Working on the viewer context menu.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp (modified) (5 diffs)

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

@@ -250 +250 @@
 private slots:
 
-    void sltHandleOpenInNewTab();
+    void sltHandleOpenLinkInNewTab();
+    void sltHandleOpenLink();
     void sltHandleFindWidgetDrag(const QPoint &delta);
     void sltHandleFindInPageSearchTextChange(const QString &strSearchText);
@@ -1044 +1045 @@
 void UIHelpBrowserViewer::contextMenuEvent(QContextMenuEvent *event)
 {
-    QMenu *pMenu = createStandardContextMenu();
+    QMenu pMenu;
+    QAction *pOpenLinkAction = new QAction(UIHelpBrowserWidget::tr("Open Link"));
+    connect(pOpenLinkAction, &QAction::triggered,
+            this, &UIHelpBrowserViewer::sltHandleOpenLink);
+
+    QAction *pOpenInNewTabAction = new QAction(UIHelpBrowserWidget::tr("Open Link in New Tab"));
+    connect(pOpenInNewTabAction, &QAction::triggered,
+            this, &UIHelpBrowserViewer::sltHandleOpenLinkInNewTab);
+
+    pMenu.addAction(pOpenLinkAction);
+    pMenu.addAction(pOpenInNewTabAction);
+
     QString strAnchor = anchorAt(event->pos());
     if (!strAnchor.isEmpty())
     {
         QString strLink = source().resolved(anchorAt(event->pos())).toString();
-
-        QAction *pOpenInNewTabAction = new QAction(UIHelpBrowserWidget::tr("Open Link in New Tab"));
+        pOpenLinkAction->setData(strLink);
         pOpenInNewTabAction->setData(strLink);
-        connect(pOpenInNewTabAction, &QAction::triggered,
-                this, &UIHelpBrowserViewer::sltHandleOpenInNewTab);
-        pMenu->addAction(pOpenInNewTabAction);
-    }
-    pMenu->exec(event->globalPos());
-    delete pMenu;
+    }
+    else
+    {
+        pOpenLinkAction->setEnabled(false);
+        pOpenInNewTabAction->setEnabled(false);
+    }
+    pMenu.exec(event->globalPos());
 }
 
@@ -1174 +1186 @@
 }
 
-void UIHelpBrowserViewer::sltHandleOpenInNewTab()
+void UIHelpBrowserViewer::sltHandleOpenLinkInNewTab()
 {
     QAction *pSender = qobject_cast<QAction*>(sender());
@@ -1182 +1194 @@
     if (url.isValid())
         emit sigOpenLinkInNewTab(url);
+}
+
+void UIHelpBrowserViewer::sltHandleOpenLink()
+{
+    QAction *pSender = qobject_cast<QAction*>(sender());
+    if (!pSender)
+        return;
+    QUrl url = pSender->data().toUrl();
+    if (url.isValid())
+        QTextBrowser::setSource(url);
 }
 
@@ -1616 +1638 @@
     m_pSearchContainerWidget = new QWidget;
     m_pTabWidget->insertTab(HelpBrowserTabs_Search, m_pSearchContainerWidget, QString());
-
+    m_pTabWidget->setTabPosition(QTabWidget::South);
     m_pSearchEngine = m_pHelpEngine->searchEngine();
     AssertReturnVoid(m_pSearchEngine);