Changeset 86806 in vbox

Timestamp:

Nov 4, 2020 11:04:53 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding a context menu to content widget

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (12 diffs)
• UIHelpBrowserWidget.h (modified) (2 diffs)

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

@@ -105 +105 @@
     void retranslateUi();
     const QHelpEngine* m_pHelpEngine;
-    QString m_strOpenInNewTab;
 };
 
@@ -183 +182 @@
     /* Url of the current tab. */
     QUrl currentSource() const;
-    void setCurrentSource(const QUrl &url);
+    void setSource(const QUrl &url, bool fNewTab = false);
     /* Return the list of urls of all open tabs as QStringList. */
     QStringList tabUrlList();
-    void addNewTab(const QUrl &initialUrl);
 
 private slots:
@@ -199 +197 @@
     void prepare();
     void clearAndDeleteTabs();
+    void addNewTab(const QUrl &initialUrl);
     const QHelpEngine* m_pHelpEngine;
     QUrl m_homeUrl;
@@ -376 +375 @@
     for (int i = -1 * m_pContentViewer->backwardHistoryCount(); i <= m_pContentViewer->forwardHistoryCount(); ++i)
     {
+        int iIndex = m_pAddressBar->count();
         m_pAddressBar->addItem(m_pContentViewer->historyUrl(i).toString(), i);
+        m_pAddressBar->setItemData(iIndex, m_pContentViewer->historyTitle(i), Qt::ToolTipRole);
         if (i == 0)
             iCurrentIndex = m_pAddressBar->count();
@@ -461 +462 @@
         QString strLink = source().resolved(anchorAt(event->pos())).toString();
 
-        QAction *pOpenInNewTabAction = new QAction(m_strOpenInNewTab);
+        QAction *pOpenInNewTabAction = new QAction(UIHelpBrowserWidget::tr("Open Link in New Tab"));
         pOpenInNewTabAction->setData(strLink);
         connect(pOpenInNewTabAction, &QAction::triggered,
@@ -473 +474 @@
 void UIHelpBrowserViewer::retranslateUi()
 {
-    m_strOpenInNewTab = UIHelpBrowserWidget::tr("Open Link in New Tab");
 }
 
@@ -535 +535 @@
 }
 
-void UIHelpBrowserTabManager::setCurrentSource(const QUrl &url)
-{
-    UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(currentWidget());
-    if (!pTab)
-        return;
-    pTab->setSource(url);
+void UIHelpBrowserTabManager::setSource(const QUrl &url, bool fNewTab /* = false */)
+{
+    if (!fNewTab)
+    {
+        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(currentWidget());
+        if (!pTab)
+            return;
+        pTab->setSource(url);
+    }
+    else
+        addNewTab(url);
 }
 
@@ -718 +723 @@
     AssertReturnVoid(m_pContentWidget && m_pIndexWidget && m_pContentModel);
     m_pSplitter->addWidget(m_pTabWidget);
+    m_pContentWidget->setContextMenuPolicy(Qt::CustomContextMenu);
 
     m_pTabWidget->insertTab(HelpBrowserTabs_TOC, m_pContentWidget, QString());
@@ -733 +739 @@
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
             this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
-    if (m_pContentWidget->selectionModel())
-        connect(m_pContentWidget->selectionModel(), &QItemSelectionModel::selectionChanged,
-                this, &UIHelpBrowserWidget::sltHandleContentWidgetSelectionChanged);
+    // if (m_pContentWidget->selectionModel())
+    //     connect(m_pContentWidget->selectionModel(), &QItemSelectionModel::selectionChanged,
+    //             this, &UIHelpBrowserWidget::sltHandleContentWidgetSelectionChanged);
+    connect(m_pContentWidget, &QHelpContentWidget::clicked,
+            this, &UIHelpBrowserWidget::sltHandleContentWidgetItemClicked);
     connect(m_pContentModel, &QHelpContentModel::contentsCreated,
             this, &UIHelpBrowserWidget::sltHandleContentsCreated);
-
+    connect(m_pContentWidget, &QHelpContentWidget::customContextMenuRequested,
+            this, &UIHelpBrowserWidget::sltOpenLinksContextMenu);
 
     if (QFile(m_strHelpFilePath).exists() && m_pHelpEngine)
@@ -888 +897 @@
 }
 
+QUrl UIHelpBrowserWidget::contentWidgetUrl(const QModelIndex &itemIndex)
+{
+    QHelpContentModel *pContentModel =
+        qobject_cast<QHelpContentModel*>(m_pContentWidget->model());
+    if (!pContentModel)
+        return QUrl();
+    QHelpContentItem *pItem = pContentModel->contentItemAt(itemIndex);
+    if (!pItem)
+        return QUrl();
+    return pItem->url();
+}
+
 void UIHelpBrowserWidget::cleanup()
 {
@@ -963 +984 @@
 {
     AssertReturnVoid(m_pTabManager && m_pHelpEngine && m_pContentWidget);
-    QHelpContentModel *pContentModel =
-        qobject_cast<QHelpContentModel*>(m_pContentWidget->model());
-    if (!pContentModel)
-        return;
-    QHelpContentItem *pItem = pContentModel->contentItemAt(index);
-    if (!pItem)
-        return;
-    const QUrl &url = pItem->url();
-    m_pTabManager->setCurrentSource(url);
+    QUrl url = contentWidgetUrl(index);
+    if (!url.isValid())
+        return;
+    m_pTabManager->setSource(url);
 
     m_pContentWidget->scrollTo(index, QAbstractItemView::EnsureVisible);
@@ -1036 +1052 @@
 }
 
+void UIHelpBrowserWidget::sltOpenLinksContextMenu(const QPoint &pos)
+{
+    QWidget *pSender = qobject_cast<QWidget*>(sender());
+    if (!pSender)
+        return;
+
+    QUrl url;
+
+    if (pSender == m_pContentWidget)
+        url = contentWidgetUrl(m_pContentWidget->currentIndex());
+
+    if (!url.isValid())
+        return;
+
+    QMenu menu;
+    QAction *pOpen = menu.addAction(tr("Open in Link"));
+    QAction *pOpenInNewTab = menu.addAction(tr("Open in Link New Tab"));
+    pOpen->setData(url);
+    pOpenInNewTab->setData(url);
+    connect(pOpenInNewTab, &QAction::triggered,
+            this, &UIHelpBrowserWidget::sltOpenLinkInNewTab);
+    connect(pOpen, &QAction::triggered,
+            this, &UIHelpBrowserWidget::sltOpenLink);
+
+    menu.exec(pSender->mapToGlobal(pos));
+}
+
+void UIHelpBrowserWidget::sltOpenLinkInNewTab()
+{
+    openLinkSlotHandler(sender(), true);
+}
+
+void UIHelpBrowserWidget::sltOpenLink()
+{
+    openLinkSlotHandler(sender(), false);
+}
+
+void UIHelpBrowserWidget::openLinkSlotHandler(QObject *pSenderObject, bool fOpenInNewTab)
+{
+    QAction *pAction = qobject_cast<QAction*>(pSenderObject);
+    if (!pAction)
+        return;
+    QUrl url = pAction->data().toUrl();
+    if (m_pTabManager && url.isValid())
+        m_pTabManager->setSource(url, fOpenInNewTab);
+}
 
 #include "UIHelpBrowserWidget.moc"

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

@@ -95 +95 @@
     void sltHandleSearchStart();
     void sltHandleHelpBrowserViewerSourceChange(const QUrl &source);
+    void sltOpenLinksContextMenu(const QPoint &pos);
+    void sltOpenLinkInNewTab();
+    void sltOpenLink();
 
 private:
@@ -109 +112 @@
     void cleanup();
     QUrl findIndexHtml() const;
-    //bool eventFilter(QObject *pWatched, QEvent *pEvent);
+    /* Returns the url of the item with @p itemIndex. */
+    QUrl contentWidgetUrl(const QModelIndex &itemIndex);
+    void openLinkSlotHandler(QObject *pSenderObject, bool fOpenInNewTab);
 
     /** @name Event handling stuff.