Changeset 86794 in vbox

Timestamp:

Nov 3, 2020 12:22:16 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Fixing content widget connections

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (9 diffs)
• UIHelpBrowserWidget.h (modified) (1 diff)

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

@@ -83 +83 @@
     virtual QVariant loadResource(int type, const QUrl &name) /* override */;
     void emitHistoryChangedSignal();
+    void setSource(const QUrl &url, const QString &strError);
 
 public slots:
@@ -152 +153 @@
 {
     Q_OBJECT;
+
+signals:
+
+    void sigSourceChanged(const QUrl &url);
 
 public:
@@ -210 +215 @@
     {
         m_pContentViewer->blockSignals(true);
-        m_pContentViewer->setSource(url);
+        m_pContentViewer->setSource(url, m_strPageNotFoundText);
         m_pContentViewer->blockSignals(false);
         /* emit historyChanged signal explicitly since we have blocked the signals: */
@@ -242 +247 @@
         this, &UIHelpBrowserTab::sltAnchorClicked);
 
-    m_pContentViewer->setSource(initialUrl);
+    m_pContentViewer->setSource(initialUrl, m_strPageNotFoundText);
 }
 
@@ -311 +316 @@
     if (!m_pContentViewer)
         return;
-    if (m_homeUrl.isValid())
-        m_pContentViewer->setSource(m_homeUrl);
+    m_pContentViewer->setSource(m_homeUrl, m_strPageNotFoundText);
 }
 
@@ -406 +410 @@
 }
 
+void UIHelpBrowserViewer::setSource(const QUrl &url, const QString &strError)
+{
+    if (!url.isValid())
+        setText(strError.arg(url.toString()));
+    else
+        QTextBrowser::setSource(url);
+}
+
 
 /*********************************************************************************************************************************
@@ -425 +437 @@
     clearAndDeleteTabs();
     /* Add a single tab with m_homeUrl: */
-    if (m_savedUrlList.isEmpty())
-    {
-        addTab(new  UIHelpBrowserTab(m_pHelpEngine, m_homeUrl, QUrl()), QString());
-    }
-    else
-    {
-        addTab(new  UIHelpBrowserTab(m_pHelpEngine, m_homeUrl, m_savedUrlList[0]), QString());
-
-    }
+    QUrl initialUrl;
+    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);
 }
 
@@ -600 +610 @@
     m_pSplitter->setChildrenCollapsible(false);
 
+    connect(m_pTabManager, &UIHelpBrowserTabManager::sigSourceChanged,
+            this, &UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange);
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
             this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
-    // connect(m_pContentWidget, &QHelpContentWidget::linkActivated,
-    //         m_pContentViewer, &UIHelpBrowserViewer::setSource);
     connect(m_pContentWidget, &QHelpContentWidget::clicked,
             this, &UIHelpBrowserWidget::sltHandleContentWidgetItemClicked);
-    // connect(m_pIndexWidget, &QHelpIndexWidget::linkActivated,
-    //         m_pContentViewer, &UIHelpBrowserViewer::setSource);
     connect(m_pContentModel, &QHelpContentModel::contentsCreated,
             this, &UIHelpBrowserWidget::sltHandleContentsCreated);
+
 
     if (QFile(m_strHelpFilePath).exists() && m_pHelpEngine)
@@ -826 +835 @@
 }
 
-void UIHelpBrowserWidget::show404Error(const QUrl & /*url*/)
-{
-//     QList<QUrl> files = m_pHelpEngine->files(m_pHelpEngine->namespaceName(m_strHelpFilePath), QStringList());
-//     int iIndex = -1;
-//     for (int i = 0; i < files.size(); ++i)
-//     {
-//         if (files[i].toString().contains("index.html", Qt::CaseInsensitive))
-//         {
-//             iIndex = i;
-//             break;
-//         }
-//     }
-//     if (iIndex == -1)
-//     {
-//         /* If index html/htm could not be found try to find a html file at least: */
-//         for (int i = 0; i < files.size(); ++i)
-//         {
-//             if (files[i].toString().contains(".html", Qt::CaseInsensitive) ||
-//                 files[i].toString().contains(".htm", Qt::CaseInsensitive))
-//             {
-//                 iIndex = i;
-//                 break;
-//             }
-//         }
-//     }
-//     if (iIndex != -1 && files.size() > iIndex)
-//         return files[iIndex];
-//     return QUrl();
-// #else
-//     return QUrl();
-}
-
 void UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished()
 {
     AssertReturnVoid(m_pTabManager && m_pHelpEngine);
     m_pTabManager->initilizeTabs();
-    /* Search for the index of the index.htnl: */
-    // QUrl url = findIndexHtml();
-    // if (url.isValid())
-    //     m_pContentViewer->setSource(url);
-    // else
-    //     show404Error(url);
-}
-
+}
 
 void UIHelpBrowserWidget::sltHandleContentWidgetItemClicked(const QModelIndex & index)

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

@@ -107 +107 @@
     void cleanup();
     QUrl findIndexHtml() const;
-    void show404Error(const QUrl &url);
     /** @name Event handling stuff.
      * @{ */
     /** Handles translation event. */
-    virtual void retranslateUi() /* override */;
+       virtual void retranslateUi() /* override */;
 
-    /** Handles Qt show @a pEvent. */
-    virtual void showEvent(QShowEvent *pEvent) /* override */;
-    /** Handles Qt key-press @a pEvent. */
-    virtual void keyPressEvent(QKeyEvent *pEvent) /* override */;
+       /** Handles Qt show @a pEvent. */
+       virtual void showEvent(QShowEvent *pEvent) /* override */;
+       /** Handles Qt key-press @a pEvent. */
+       virtual void keyPressEvent(QKeyEvent *pEvent) /* override */;
     /** @} */