Changeset 86747 in vbox

Timestamp:

Oct 28, 2020 7:01:14 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141139

Message:

FE/Qt: bugref:9831. Adding ad address bar

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (14 diffs)
• UIHelpBrowserWidget.h (modified) (5 diffs)

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

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QComboBox>
 #include <QDateTime>
 #include <QDir>
@@ -28 +29 @@
 #include <QMenu>
 #include <QScrollBar>
+#include <QSpacerItem>
 #include <QStyle>
 #include <QSplitter>
@@ -60 +62 @@
 Q_DECLARE_METATYPE(HelpBrowserTabs);
 
+class UIHelpBrowserAddressBar : public QComboBox
+{
+    Q_OBJECT;
+
+public:
+    UIHelpBrowserAddressBar(QWidget *pParent = 0);
+
+};
+
 class UIHelpBrowserViewer : public QTextBrowser
 {
@@ -68 +79 @@
     UIHelpBrowserViewer(const QHelpEngine *pHelpEngine, QWidget *pParent = 0);
     virtual QVariant loadResource(int type, const QUrl &name) /* override */;
+    void emitHistoryChangedSignal();
+
+public slots:
+
+    //virtual void setSource(const QUrl &name) /* override */;
 
 private:
@@ -75 +91 @@
 #endif
 };
+
+UIHelpBrowserAddressBar::UIHelpBrowserAddressBar(QWidget *pParent /* = 0 */)
+    :QComboBox(pParent)
+{
+}
 
 UIHelpBrowserViewer::UIHelpBrowserViewer(const QHelpEngine *pHelpEngine, QWidget *pParent /* = 0 */)
@@ -99 +120 @@
 }
 
+void UIHelpBrowserViewer::emitHistoryChangedSignal()
+{
+    emit historyChanged();
+    emit backwardAvailable(true);
+}
 
 UIHelpBrowserWidget::UIHelpBrowserWidget(EmbedTo enmEmbedding,
@@ -109 +135 @@
     , m_fIsPolished(false)
     , m_pMainLayout(0)
+    , m_pTopLayout(0)
     , m_pTabWidget(0)
     , m_pToolBar(0)
@@ -115 +142 @@
     , m_pHelpEngine(0)
 #endif
+    , m_pAddressBar(0)
     , m_pContentViewer(0)
     , m_pSplitter(0)
@@ -227 +255 @@
     connect(m_pContentViewer, &UIHelpBrowserViewer::sourceChanged,
         this, &UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange);
+    connect(m_pContentViewer, &UIHelpBrowserViewer::historyChanged,
+        this, &UIHelpBrowserWidget::sltHandleHistoryChanged);
 
     m_pSplitter->addWidget(m_pContentViewer);
@@ -249 +279 @@
 #endif
 }
-
+#include <QPushButton>
 void UIHelpBrowserWidget::prepareToolBar()
 {
+    m_pTopLayout = new QHBoxLayout;
     /* Create toolbar: */
     m_pToolBar = new QIToolBar(parentWidget());
@@ -269 +300 @@
         {
             /* Add into layout: */
-            m_pMainLayout->addWidget(m_pToolBar);
+            m_pTopLayout->addWidget(m_pToolBar);
+            m_pMainLayout->addLayout(m_pTopLayout);
         }
 #else
         /* Add into layout: */
-        m_pMainLayout->addWidget(m_pToolBar);
-#endif
-    }
+        m_pTopLayout->addWidget(m_pToolBar);
+        m_pMainLayout->addLayout(m_pTopLayout);
+#endif
+    }
+    m_pAddressBar = new UIHelpBrowserAddressBar();
+    m_pAddressBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    m_pTopLayout->addWidget(m_pAddressBar);
+    connect(m_pAddressBar, static_cast<void(UIHelpBrowserAddressBar::*)(int)>(&UIHelpBrowserAddressBar::currentIndexChanged),
+            this, &UIHelpBrowserWidget::sltHandleAddressBarIndexChanged);
+
+    //m_pTopLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed));
 }
 
@@ -299 +339 @@
         {
             if (m_pHelpEngine->findFile(url).isValid())
+            {
                 m_pContentViewer->setSource(url);
+                m_pContentViewer->clearHistory();
+            }
             else
                 show404Error(url);
@@ -469 +512 @@
     m_pContentViewer->setSource(url);
     m_pContentViewer->blockSignals(false);
+    /* emit historyChanged signal explicitly since we have blocked the signals: */
+    m_pContentViewer->emitHistoryChangedSignal();
 #else
     Q_UNUSED(index);
@@ -537 +582 @@
 }
 
+void UIHelpBrowserWidget::sltHandleHistoryChanged()
+{
+    if (!m_pContentViewer)
+        return;
+    int iCurrentIndex = 0;
+    /* QTextBrower history has negative and positive indices for bacward and forward items, respectively.
+     * 0 is the current item: */
+    m_pAddressBar->blockSignals(true);
+    m_pAddressBar->clear();
+    for (int i = -1 * m_pContentViewer->backwardHistoryCount(); i <= m_pContentViewer->forwardHistoryCount(); ++i)
+    {
+        m_pAddressBar->addItem(m_pContentViewer->historyTitle(i), i);
+        if (i == 0)
+            iCurrentIndex = m_pAddressBar->count();
+    }
+    /* Make sure address bar show the current item: */
+    m_pAddressBar->setCurrentIndex(iCurrentIndex - 1);
+    m_pAddressBar->blockSignals(false);
+}
+
+void UIHelpBrowserWidget::sltHandleAddressBarIndexChanged(int iIndex)
+{
+    if (!m_pAddressBar && iIndex >= m_pAddressBar->count())
+        return;
+    int iHistoryIndex = m_pAddressBar->itemData(iIndex).toInt();
+    /* There seems to be no way to one-step-jump to a history item: */
+    if (iHistoryIndex == 0)
+        return;
+    else if (iHistoryIndex > 0)
+        for (int i = 0; i < iHistoryIndex; ++i)
+            m_pContentViewer->forward();
+    else
+        for (int i = 0; i > iHistoryIndex ; --i)
+            m_pContentViewer->backward();
+
+}
+
 #include "UIHelpBrowserWidget.moc"

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

@@ -37 +37 @@
 
 /* Forward declarations: */
+class QHBoxLayout;
 class QVBoxLayout;
 class QHelpEngine;
@@ -48 +49 @@
 class UIActionPool;
 class UIDialogPanel;
+class UIHelpBrowserAddressBar;
 class UIHelpBrowserViewer;
 
@@ -89 +91 @@
     void sltHandleForwardAvailable(bool fAvailable);
     void sltHandleBackwardAvailable(bool fAvailable);
+    void sltHandleHistoryChanged();
+    void sltHandleAddressBarIndexChanged(int index);
 
 private:
@@ -126 +130 @@
     /** Holds container for log-pages. */
     QVBoxLayout         *m_pMainLayout;
+    QHBoxLayout         *m_pTopLayout;
+
     QITabWidget *m_pTabWidget;
     /** @name Toolbar and menu variables.
@@ -136 +142 @@
     QHelpEngine  *m_pHelpEngine;
 #endif
+    UIHelpBrowserAddressBar *m_pAddressBar;
     UIHelpBrowserViewer *m_pContentViewer;
     QSplitter           *m_pSplitter;