Changeset 87217 in vbox for trunk/src

Timestamp:

Jan 11, 2021 5:31:52 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding new tab action to middle mouse click

Location:

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

Files:

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

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

@@ -189 +189 @@
     void sigSourceChanged(const QUrl &url);
     void sigTitleUpdate(const QString &strTitle);
-    void sigOpenLinkInNewTab(const QUrl &url);
+    void sigOpenLinkInNewTab(const QUrl &url, bool fBackground);
     void sigAddBookmark(const QUrl &url, const QString &strTitle);
     void sigFontPointSizeChanged(int iFontPointSize);
@@ -292 +292 @@
 
     void sltHandletabTitleChange(const QString &strTitle);
-    void sltHandleOpenLinkInNewTab(const QUrl &url);
+    void sltHandleOpenLinkInNewTab(const QUrl &url, bool fBackground);
     void sltHandleTabClose(int iTabIndex);
     void sltHandleContextMenuTabClose();
@@ -304 +304 @@
     void prepare();
     void clearAndDeleteTabs();
-    void addNewTab(const QUrl &initialUrl);
+    void addNewTab(const QUrl &initialUrl, bool fBackground);
     /** Check if lists of tab url/title has changed. if so emit a signal. */
     void updateTabUrlTitleList();
@@ -841 +841 @@
 }
 
-void UIHelpBrowserTabManager::addNewTab(const QUrl &initialUrl)
+void UIHelpBrowserTabManager::addNewTab(const QUrl &initialUrl, bool fBackground)
 {
    UIHelpBrowserTab *pTabWidget = new  UIHelpBrowserTab(m_pHelpEngine, m_homeUrl, initialUrl);
@@ -860 +860 @@
            this, &UIHelpBrowserTabManager::sigLinkHighlighted);
 
-   if (m_fSwitchToNewTab)
+   if (!fBackground)
        setCurrentIndex(index);
 
@@ -905 +905 @@
     /* Start with a single tab showing the home URL: */
     if (m_savedUrlList.isEmpty())
-        addNewTab(QUrl());
+        addNewTab(QUrl(), false);
     /* Start with saved tab(s): */
     else
         for (int i = 0; i < m_savedUrlList.size(); ++i)
-            addNewTab(m_savedUrlList[i]);
+            addNewTab(m_savedUrlList[i], false);
     updateTabUrlTitleList();
 }
@@ -931 +931 @@
     }
     else
-        addNewTab(url);
+        addNewTab(url, false);
 
     updateTabUrlTitleList();
@@ -1052 +1052 @@
 }
 
-void UIHelpBrowserTabManager::sltHandleOpenLinkInNewTab(const QUrl &url)
+void UIHelpBrowserTabManager::sltHandleOpenLinkInNewTab(const QUrl &url, bool fBackground)
 {
     if (url.isValid())
-        addNewTab(url);
+        addNewTab(url, fBackground);
     updateTabUrlTitleList();
 }

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

@@ -520 +520 @@
 }
 
+void UIHelpViewer::mousePressEvent(QMouseEvent *pEvent)
+{
+    QString strAnchor = anchorAt(pEvent->pos());
+    if (!strAnchor.isEmpty())
+    {
+        QString strLink = source().resolved(strAnchor).toString();
+        emit sigOpenLinkInNewTab(strLink, true);
+    }
+    QIWithRetranslateUI<QTextBrowser>::mousePressEvent(pEvent);
+}
+
 void UIHelpViewer::retranslateUi()
 {
@@ -616 +627 @@
     QUrl url = pSender->data().toUrl();
     if (url.isValid())
-        emit sigOpenLinkInNewTab(url);
+        emit sigOpenLinkInNewTab(url, false);
 }
 

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

@@ -39 +39 @@
 signals:
 
-    void sigOpenLinkInNewTab(const QUrl &url);
+    void sigOpenLinkInNewTab(const QUrl &url, bool fBackground);
     void sigCloseFindInPageWidget();
     void sigFontPointSizeChanged(int iFontPointSize);
@@ -66 +66 @@
     virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
     virtual void wheelEvent(QWheelEvent *pEvent) /* override */;
+    virtual void mousePressEvent(QMouseEvent *pEvent) /* override */;
 
 private slots: