Changeset 86800 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 3, 2020 6:50:12 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding a new context menu item text browser to open links on a new tab

File:

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

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

@@ -75 +75 @@
 *********************************************************************************************************************************/
 
-class UIHelpBrowserViewer : public QTextBrowser
+class UIHelpBrowserViewer : public QIWithRetranslateUI<QTextBrowser>
 {
     Q_OBJECT;
+
+signals:
+
+    void sigOpenLinkInNewTab(const QUrl &url);
 
 public:
@@ -88 +92 @@
 public slots:
 
-    //virtual void setSource(const QUrl &name) /* override */;
+
+protected:
+
+    void contextMenuEvent(QContextMenuEvent *event) /* override */;
+
+private slots:
+
+    void sltHandleOpenInNewTab();
 
 private:
 
+    void retranslateUi();
     const QHelpEngine* m_pHelpEngine;
+    QString m_strOpenInNewTab;
 };
 
@@ -106 +119 @@
 
     void sigSourceChanged(const QUrl &url);
+    void sigTitleUpdate(const QString &strTitle);
+    void sigOpenLinkInNewTab(const QUrl &url);
 
 public:
@@ -114 +129 @@
     QUrl source() const;
     void setSource(const QUrl &url);
+    QString documentTitle() const;
 
 private slots:
@@ -170 +186 @@
     /* Return the list of urls of all open tabs as QStringList. */
     QStringList tabUrlList();
+    void addNewTab(const QUrl &initialUrl);
+
+private slots:
+
+    void sltHandletabTitleChange(const QString &strTitle);
+    void sltHandleOpenLinkInNewTab(const QUrl &url);
 
 private:
@@ -178 +200 @@
     QUrl m_homeUrl;
     QStringList m_savedUrlList;
+    bool m_fSwitchToNewTab;
 };
 
@@ -223 +246 @@
 }
 
+QString UIHelpBrowserTab::documentTitle() const
+{
+    if (!m_pContentViewer)
+        return QString();
+    return m_pContentViewer->documentTitle();
+}
+
 void UIHelpBrowserTab::prepare(const QUrl &initialUrl)
 {
@@ -247 +277 @@
     connect(m_pContentViewer, &UIHelpBrowserViewer::anchorClicked,
         this, &UIHelpBrowserTab::sltAnchorClicked);
-
+    connect(m_pContentViewer, &UIHelpBrowserViewer::sigOpenLinkInNewTab,
+        this, &UIHelpBrowserTab::sigOpenLinkInNewTab);
     m_pContentViewer->setSource(initialUrl, m_strPageNotFoundText);
 }
@@ -357 +388 @@
         m_pForwardAction->setEnabled(m_pContentViewer->isForwardAvailable());
 
+    emit sigTitleUpdate(m_pContentViewer->historyTitle(0));
 }
 
@@ -391 +423 @@
 
 UIHelpBrowserViewer::UIHelpBrowserViewer(const QHelpEngine *pHelpEngine, QWidget *pParent /* = 0 */)
-    :QTextBrowser(pParent)
+    :QIWithRetranslateUI<QTextBrowser>(pParent)
     , m_pHelpEngine(pHelpEngine)
 {
     Q_UNUSED(pHelpEngine);
+    retranslateUi();
 }
 
@@ -419 +452 @@
 }
 
+void UIHelpBrowserViewer::contextMenuEvent(QContextMenuEvent *event)
+{
+    QMenu *pMenu = createStandardContextMenu();
+    QString strAnchor = anchorAt(event->pos());
+    if (!strAnchor.isEmpty())
+    {
+        QString strLink = source().resolved(anchorAt(event->pos())).toString();
+
+        QAction *pOpenInNewTabAction = new QAction(m_strOpenInNewTab);
+        pOpenInNewTabAction->setData(strLink);
+        connect(pOpenInNewTabAction, &QAction::triggered,
+                this, &UIHelpBrowserViewer::sltHandleOpenInNewTab);
+        pMenu->addAction(pOpenInNewTabAction);
+    }
+    pMenu->exec(event->globalPos());
+    delete pMenu;
+}
+
+void UIHelpBrowserViewer::retranslateUi()
+{
+    m_strOpenInNewTab = UIHelpBrowserWidget::tr("Open Link in New Tab");
+}
+
+void UIHelpBrowserViewer::sltHandleOpenInNewTab()
+{
+    QAction *pSender = qobject_cast<QAction*>(sender());
+    if (!pSender)
+        return;
+    QUrl url = pSender->data().toUrl();
+    if (url.isValid())
+        emit sigOpenLinkInNewTab(url);
+}
 
 /*********************************************************************************************************************************
@@ -430 +495 @@
     , m_homeUrl(homeUrl)
     , m_savedUrlList(urlList)
+    , m_fSwitchToNewTab(true)
 {
     prepare();
+}
+
+void UIHelpBrowserTabManager::addNewTab(const QUrl &initialUrl)
+{
+   UIHelpBrowserTab *pTabWidget = new  UIHelpBrowserTab(m_pHelpEngine, m_homeUrl, initialUrl);
+   AssertReturnVoid(pTabWidget);
+   int index = addTab(pTabWidget, pTabWidget->documentTitle());
+   connect(pTabWidget, &UIHelpBrowserTab::sigSourceChanged,
+           this, &UIHelpBrowserTabManager::sigSourceChanged);
+   connect(pTabWidget, &UIHelpBrowserTab::sigTitleUpdate,
+           this, &UIHelpBrowserTabManager::sltHandletabTitleChange);
+   connect(pTabWidget, &UIHelpBrowserTab::sigOpenLinkInNewTab,
+           this, &UIHelpBrowserTabManager::sltHandleOpenLinkInNewTab);
+   if (m_fSwitchToNewTab)
+       setCurrentIndex(index);
 }
 
@@ -441 +522 @@
     if (!m_savedUrlList.isEmpty())
         initialUrl = m_savedUrlList[0];
-    UIHelpBrowserTab *pTabWidget = new  UIHelpBrowserTab(m_pHelpEngine, m_homeUrl, initialUrl);
-    addTab(pTabWidget, QString());
-    connect(pTabWidget, &UIHelpBrowserTab::sigSourceChanged,
-            this, &UIHelpBrowserTabManager::sigSourceChanged);
+    addNewTab(initialUrl);
 }
 
@@ -474 +552 @@
     }
     return list;
+}
+
+void UIHelpBrowserTabManager::sltHandletabTitleChange(const QString &strTitle)
+{
+    for (int i = 0; i < count(); ++i)
+    {
+        if (sender() == widget(i))
+        {
+            setTabText(i, strTitle);
+            continue;
+        }
+    }
+}
+
+void UIHelpBrowserTabManager::sltHandleOpenLinkInNewTab(const QUrl &url)
+{
+    if (url.isValid())
+        addNewTab(url);
 }
 
@@ -858 +954 @@
     m_pContentWidget->scrollTo(index, QAbstractItemView::EnsureVisible);
     m_pContentWidget->expand(index);
-
 }