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

Timestamp:

Oct 30, 2020 6:29:07 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Making sure that there is only one help browser instance at one time

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (2 diffs)
• helpbrowser/UIHelpBrowserWidget.cpp (modified) (5 diffs)
• helpbrowser/UIHelpBrowserWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -3227 +3227 @@
 
 UIMessageCenter::UIMessageCenter()
+    : m_pHelpBrowserDialog(0)
 {
     /* Assign instance: */
@@ -3397 +3398 @@
 void UIMessageCenter::showHelpBrowser(const QString strHelpFilePath, QWidget *pParent /* = 0 */)
 {
-    QWidget *pDialogParent = windowManager().realParentWindow(pParent ? pParent : windowManager().mainWindowShown());
-    AssertReturnVoid(pDialogParent);
-
-
-    QIManagerDialog *pHelpBrowserDialog;
-    UIHelpBrowserDialogFactory dialogFactory(strHelpFilePath);
-
-    dialogFactory.prepare(pHelpBrowserDialog);
-    AssertReturnVoid(pHelpBrowserDialog);
-
-    connect(pHelpBrowserDialog, &QIManagerDialog::sigClose,
-            this, &UIMessageCenter::sltCloseHelpBrowser);
-
-    pHelpBrowserDialog->show();
-    pHelpBrowserDialog->setWindowState(pHelpBrowserDialog->windowState() & ~Qt::WindowMinimized);
-    pHelpBrowserDialog->activateWindow();
+    Q_UNUSED(pParent);
+    if (!m_pHelpBrowserDialog)
+    {
+
+        UIHelpBrowserDialogFactory dialogFactory(strHelpFilePath);
+        dialogFactory.prepare(m_pHelpBrowserDialog);
+        AssertReturnVoid(m_pHelpBrowserDialog);
+        connect(m_pHelpBrowserDialog, &QIManagerDialog::sigClose,
+                this, &UIMessageCenter::sltCloseHelpBrowser);
+    }
+    m_pHelpBrowserDialog->show();
+    m_pHelpBrowserDialog->setWindowState(m_pHelpBrowserDialog->windowState() & ~Qt::WindowMinimized);
+    m_pHelpBrowserDialog->activateWindow();
 }
 
 void UIMessageCenter::sltCloseHelpBrowser()
 {
-    QIManagerDialog *pDialog = qobject_cast<QIManagerDialog*>(sender());
-    if (!pDialog)
+    QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
+    if (m_pHelpBrowserDialog != pDialog || !pDialog)
         return;
 
+    m_pHelpBrowserDialog = 0;
+    pDialog->close();
     UIHelpBrowserDialogFactory().cleanup(pDialog);
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -34 +34 @@
 
 /* Forward declarations: */
+class QIManagerDialog;
 class UIMedium;
 struct StorageSlot;
@@ -604 +605 @@
     mutable QStringList m_warnings;
 
+    /** Holds UIHelpBrowserDialog instance. */
+    QIManagerDialog *m_pHelpBrowserDialog;
+
     /** Holds the singleton message-center instance. */
     static UIMessageCenter *s_pInstance;

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

@@ -262 +262 @@
     AssertReturnVoid(m_pContentViewer);
 
+    m_pContentViewer->setOpenExternalLinks(false);
+
     connect(m_pContentViewer, &UIHelpBrowserViewer::sourceChanged,
         this, &UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange);
@@ -272 +274 @@
     connect(m_pContentViewer, &UIHelpBrowserViewer::historyChanged,
         this, &UIHelpBrowserWidget::sltHandleHistoryChanged);
+    connect(m_pContentViewer, &UIHelpBrowserViewer::anchorClicked,
+        this, &UIHelpBrowserWidget::sltAnchorClicked);
+
 
     m_pSplitter->addWidget(m_pContentViewer);
@@ -336 +341 @@
             this, &UIHelpBrowserWidget::sltHandleSearchingStarted);
 
-
+    m_pHelpSearchEngine->reindexDocumentation();
 # endif//if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
 #endif
@@ -656 +661 @@
     for (int i = -1 * m_pContentViewer->backwardHistoryCount(); i <= m_pContentViewer->forwardHistoryCount(); ++i)
     {
-        m_pAddressBar->addItem(m_pContentViewer->historyTitle(i), i);
+        QString strItem = QString("%1 (%2)").arg(m_pContentViewer->historyTitle(i)).arg(m_pContentViewer->historyUrl(i).toString());
+        m_pAddressBar->addItem(strItem, i);
         if (i == 0)
             iCurrentIndex = m_pAddressBar->count();
@@ -713 +719 @@
 #endif
 }
+
+void UIHelpBrowserWidget::sltAnchorClicked(const QUrl &link)
+{
+    Q_UNUSED(link);
+}
+
 #include "UIHelpBrowserWidget.moc"

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

@@ -101 +101 @@
     void sltHandleSearchingStarted();
     void sltHandleSearchStart();
-
+    void sltAnchorClicked(const QUrl &link);
 private: