Changeset 88392 in vbox

Timestamp:

Apr 7, 2021 10:41:40 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Misc. fixes

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (6 diffs)
• UIHelpViewer.cpp (modified) (4 diffs)
• UIHelpViewer.h (modified) (2 diffs)

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

@@ -262 +262 @@
     UIHelpBrowserTabManager(const QHelpEngine  *pHelpEngine, const QUrl &homeUrl,
                             const QStringList &urlList, QWidget *pParent = 0);
-    /* Return the list of urls of all open tabs as QStringList. */
+    /* Returns the list of urls of all open tabs as QStringList. */
     QStringList tabUrlList() const;
     QStringList tabTitleList() const;
@@ -273 +273 @@
     void setToolBarVisible(bool fVisible);
     void printCurrent(QPrinter &printer);
-    int initialFontPointSize() const;
+    int  initialFontPointSize() const;
     void setFontPointSize(int iPointSize);
-    int fontPointSize() const;
+    int  fontPointSize() const;
     void setFontScaleWidgetVisible(bool fToggled);
     void switchToTab(int iIndex);
@@ -308 +308 @@
     /** Closes all tabs other than the one with index @param iTabIndex. */
     void closeAllTabsBut(int iTabIndex);
+    /* Returns the tab index with @Url if there is one. Returns -1 otherwise. */
+    int  findTab(const QUrl &Url) const;
     const QHelpEngine* m_pHelpEngine;
     UIFontScaleWidget *m_pFontScaleWidget;
@@ -838 +840 @@
 void UIHelpBrowserTabManager::addNewTab(const QUrl &initialUrl, bool fBackground)
 {
-   UIHelpBrowserTab *pTabWidget = new  UIHelpBrowserTab(m_pHelpEngine, m_homeUrl, initialUrl);
-   AssertReturnVoid(pTabWidget);
-   pTabWidget->setToolBarVisible(m_fToolBarVisible);
-   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);
-   connect(pTabWidget, &UIHelpBrowserTab::sigAddBookmark,
-           this, &UIHelpBrowserTabManager::sigAddBookmark);
-   connect(pTabWidget, &UIHelpBrowserTab::sigFontPointSizeChanged,
-           this, &UIHelpBrowserTabManager::sltHandleFontSizeChange);
-   connect(pTabWidget, &UIHelpBrowserTab::sigLinkHighlighted,
-           this, &UIHelpBrowserTabManager::sigLinkHighlighted);
-
-   if (!fBackground)
-       setCurrentIndex(index);
-
-   if (!m_pFontScaleWidget)
-   {
-       m_pFontScaleWidget = new UIFontScaleWidget(initialFontPointSize(), this);
-       connect(m_pFontScaleWidget, &UIFontScaleWidget::sigFontPointSizeChanged,
-               this, &UIHelpBrowserTabManager::sltHandleFontSizeChange);
-   }
+    /* If there is already a tab with a source which is equal to @initialUrl then make it current: */
+    int iExistIndex = findTab(initialUrl);
+    if (iExistIndex != -1)
+    {
+        setCurrentIndex(iExistIndex);
+        return;
+    }
+
+    UIHelpBrowserTab *pTabWidget = new  UIHelpBrowserTab(m_pHelpEngine, m_homeUrl, initialUrl);
+    AssertReturnVoid(pTabWidget);
+    pTabWidget->setToolBarVisible(m_fToolBarVisible);
+    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);
+    connect(pTabWidget, &UIHelpBrowserTab::sigAddBookmark,
+            this, &UIHelpBrowserTabManager::sigAddBookmark);
+    connect(pTabWidget, &UIHelpBrowserTab::sigFontPointSizeChanged,
+            this, &UIHelpBrowserTabManager::sltHandleFontSizeChange);
+    connect(pTabWidget, &UIHelpBrowserTab::sigLinkHighlighted,
+            this, &UIHelpBrowserTabManager::sigLinkHighlighted);
+
+    if (!fBackground)
+        setCurrentIndex(index);
+
+    if (!m_pFontScaleWidget)
+    {
+        m_pFontScaleWidget = new UIFontScaleWidget(initialFontPointSize(), this);
+        connect(m_pFontScaleWidget, &UIFontScaleWidget::sigFontPointSizeChanged,
+                this, &UIHelpBrowserTabManager::sltHandleFontSizeChange);
+    }
 }
 
@@ -893 +903 @@
     addTab(widgetList[iTabIndex], strTitle);
     updateTabUrlTitleList();
+}
+
+int  UIHelpBrowserTabManager::findTab(const QUrl &Url) const
+{
+    for (int i = 0; i < count(); ++i)
+    {
+        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(i));
+        if (!pTab || !pTab->source().isValid())
+            continue;
+        if (pTab->source() == Url)
+            return i;
+    }
+    return -1;
 }
 
@@ -956 +979 @@
     return list;
 }
-
 
 void UIHelpBrowserTabManager::setToolBarVisible(bool fVisible)

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

@@ -31 +31 @@
 #include <QHBoxLayout>
 #include <QScrollBar>
+#include <QTextBlock>
 #include <QWidgetAction>
 #ifdef RT_OS_SOLARIS
@@ -374 +375 @@
     QTextBrowser::setSource(url);
     QTextDocument *pDocument = document();
+    //iterateDocumentImages();
     if (!pDocument || pDocument->isEmpty())
     {
@@ -525 +527 @@
     if (!strAnchor.isEmpty())
     {
-        QString strLink = source().resolved(strAnchor).toString();
-        emit sigOpenLinkInNewTab(strLink, true);
+        if (pEvent->modifiers() & Qt::ControlModifier)
+        {
+            QString strLink = source().resolved(strAnchor).toString();
+            emit sigOpenLinkInNewTab(strLink, true);
+            return;
+        }
     }
     QIWithRetranslateUI<QTextBrowser>::mousePressEvent(pEvent);
@@ -620 +626 @@
 }
 
+void UIHelpViewer::iterateDocumentImages()
+{
+    QTextCursor cursor = textCursor();
+    cursor.movePosition(QTextCursor::Start);
+    while (!cursor.atEnd())
+    {
+        cursor.movePosition(QTextCursor::NextCharacter);
+        if (cursor.charFormat().isImageFormat())
+        {
+            QTextImageFormat imageFormat = cursor.charFormat().toImageFormat();
+            printf("%s %lf\n", qPrintable(imageFormat.name()), imageFormat.width());
+        }
+    }
+}
+
 void UIHelpViewer::sltHandleOpenLinkInNewTab()
 {

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

@@ -87 +87 @@
     void highlightFinds(int iSearchTermLength);
     void selectMatch(int iMatchIndex, int iSearchStringLength);
+    void iterateDocumentImages();
     const QHelpEngine* m_pHelpEngine;
     UIFindInPageWidget *m_pFindInPageWidget;
@@ -97 +98 @@
     int m_iSearchTermLength;
     int m_iInitialFontPointSize;
+    QMap<QString, qreal> m_imageSizesMap;
 };