Changeset 86812 in vbox

Timestamp:

Nov 5, 2020 1:50:30 PM (4 years ago)

Author:

vboxsync

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

141253

Message:

FE/Qt: bugref:9831. Adding a search widget to in-page string searches

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (1 diff)
• images/drag_move_16px.png (added)
• src/helpbrowser/UIHelpBrowserWidget.cpp (modified) (23 diffs)
• src/helpbrowser/UIHelpBrowserWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

@@ -163 +163 @@
         <file alias="drag_drop_16px.png">images/drag_drop_16px.png</file>
         <file alias="drag_drop_disabled_16px.png">images/drag_drop_disabled_16px.png</file>
+        <file alias="drag_move_16px.png">images/drag_move_16px.png</file>
         <file alias="edata_add_16px.png">images/edata_add_16px.png</file>
         <file alias="edata_add_24px.png">images/edata_add_24px.png</file>

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

@@ -30 +30 @@
  #include <QtHelp/QHelpSearchResultWidget>
 #endif
+#include <QLabel>
 #include <QMenu>
 #include <QMouseEvent>
+#include <QPixmap>
 #include <QScrollBar>
 #include <QSpacerItem>
@@ -43 +45 @@
 
 /* GUI includes: */
+#include "UICommon.h"
 #include "QIFileDialog.h"
 #include "QITabWidget.h"
+#include "QIToolBar.h"
+#include "QIToolButton.h"
 #include "UIActionPool.h"
 #include "UIExtraDataManager.h"
+#include "UIHelpBrowserWidget.h"
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
-#include "UIHelpBrowserWidget.h"
-#include "QITabWidget.h"
-#include "QIToolBar.h"
-#include "UICommon.h"
-#include "UIIconPool.h"
+#include "UISearchLineEdit.h"
+
 
 /* COM includes: */
@@ -63 +66 @@
 {
     HelpBrowserTabs_TOC = 0,
-    HelpBrowserTabs_Index,
     HelpBrowserTabs_Search,
     HelpBrowserTabs_Bookmarks,
+    HelpBrowserTabs_Index,
     HelpBrowserTabs_Max
 };
 Q_DECLARE_METATYPE(HelpBrowserTabs);
 
+
+/*********************************************************************************************************************************
+*   UIFindInPageWidget definition.                                                                                        *
+*********************************************************************************************************************************/
+class UIFindInPageWidget : public QIWithRetranslateUI<QWidget>
+{
+
+    Q_OBJECT;
+
+signals:
+
+    void sigDragging(const QPoint &delta);
+
+public:
+
+    UIFindInPageWidget(QWidget *pParent = 0);
+
+protected:
+
+    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
+
+private:
+
+    void prepare();
+    void retranslateUi();
+    UISearchLineEdit  *m_pSearchLineEdit;
+    QIToolButton      *m_pDownButton;
+    QIToolButton      *m_pUpButton;
+    QLabel            *m_pDragMoveLabel;
+    QPoint m_previousMousePosition;
+};
 
 /*********************************************************************************************************************************
@@ -96 +130 @@
 
     void contextMenuEvent(QContextMenuEvent *event) /* override */;
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
+    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
 
 private slots:
 
     void sltHandleOpenInNewTab();
+    void sltHandleFindWidgetDrag(const QPoint &delta);
 
 private:
@@ -105 +142 @@
     void retranslateUi();
     const QHelpEngine* m_pHelpEngine;
+    UIFindInPageWidget *m_pFindInPageWidget;
+    /* Initilized as false and set to true once the find widget is positioned during first resize. */
+    bool m_fFindWidgetPositioned;
 };
 
@@ -129 +169 @@
     void setSource(const QUrl &url);
     QString documentTitle() const;
+    void setToolBarVisible(bool fVisible);
 
 private slots:
@@ -151 +192 @@
     QAction     *m_pBackwardAction;
     QAction     *m_pAddBookmarkAction;
+    QAction     *m_pFindInPageAction;
 
     QVBoxLayout *m_pMainLayout;
     QIToolBar   *m_pToolBar;
-    QComboBox *m_pAddressBar;
+    QComboBox   *m_pAddressBar;
     UIHelpBrowserViewer *m_pContentViewer;
     const QHelpEngine* m_pHelpEngine;
@@ -185 +227 @@
     /* Return the list of urls of all open tabs as QStringList. */
     QStringList tabUrlList();
+    void setToolBarVisible(bool fVisible);
 
 private slots:
@@ -205 +248 @@
 
 /*********************************************************************************************************************************
+*   UIFindInPageWidget implementation.                                                                                        *
+*********************************************************************************************************************************/
+UIFindInPageWidget::UIFindInPageWidget(QWidget *pParent /* = 0 */)
+    : QIWithRetranslateUI<QWidget>(pParent)
+    , m_pSearchLineEdit(0)
+    , m_pDownButton(0)
+    , m_pUpButton(0)
+    , m_previousMousePosition(-1, -1)
+{
+    prepare();
+}
+
+bool UIFindInPageWidget::eventFilter(QObject *pObject, QEvent *pEvent)
+{
+    if (pObject == m_pDragMoveLabel)
+    {
+        if (pEvent->type() == QEvent::MouseMove)
+        {
+            QMouseEvent *pMouseEvent = static_cast<QMouseEvent*>(pEvent);
+            if (pMouseEvent->buttons() == Qt::LeftButton)
+            {
+                if (m_previousMousePosition != QPoint(-1, -1))
+                    emit sigDragging(pMouseEvent->globalPos() - m_previousMousePosition);
+                m_previousMousePosition = pMouseEvent->globalPos();
+            }
+        }
+        else if (pEvent->type() == QEvent::MouseButtonRelease)
+            m_previousMousePosition = QPoint(-1, -1);
+    }
+    return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
+}
+
+void UIFindInPageWidget::prepare()
+{
+    setAutoFillBackground(true);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+
+    QHBoxLayout *pLayout = new QHBoxLayout(this);
+    m_pSearchLineEdit = new UISearchLineEdit;
+    AssertReturnVoid(pLayout && m_pSearchLineEdit);
+
+    pLayout->setContentsMargins(0, 0, 0, 0);
+    pLayout->setContentsMargins(0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
+                                0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin),
+                                0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin),
+                                0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
+    m_pDragMoveLabel = new QLabel;
+    AssertReturnVoid(m_pDragMoveLabel);
+    m_pDragMoveLabel->installEventFilter(this);
+    m_pDragMoveLabel->setPixmap(QPixmap(":/drag_move_16px.png"));
+    pLayout->addWidget(m_pDragMoveLabel);
+
+
+    pLayout->setSpacing(0);
+    pLayout->addWidget(m_pSearchLineEdit);
+
+    m_pUpButton = new QIToolButton;
+    m_pDownButton = new QIToolButton;
+
+    pLayout->addWidget(m_pUpButton);
+    pLayout->addWidget(m_pDownButton);
+
+    m_pUpButton->setIcon(UIIconPool::iconSet(":/arrow_up_10px.png"));
+    m_pDownButton->setIcon(UIIconPool::iconSet(":/arrow_down_10px.png"));
+
+}
+
+void UIFindInPageWidget::retranslateUi()
+{
+}
+
+/*********************************************************************************************************************************
 *   UIHelpBrowserTab implementation.                                                                                        *
 *********************************************************************************************************************************/
@@ -215 +330 @@
     , m_pBackwardAction(0)
     , m_pAddBookmarkAction(0)
+    , m_pFindInPageAction(0)
     , m_pMainLayout(0)
     , m_pToolBar(0)
@@ -252 +368 @@
         return QString();
     return m_pContentViewer->documentTitle();
+}
+
+void UIHelpBrowserTab::setToolBarVisible(bool fVisible)
+{
+    if (m_pToolBar)
+        m_pToolBar->setVisible(fVisible);
+    if (m_pAddressBar)
+        m_pAddressBar->setVisible(fVisible);
 }
 
@@ -293 +417 @@
     m_pAddBookmarkAction =
         new QAction(UIIconPool::iconSet(":/help_browser_add_bookmark.png"), QString(), this);
+    m_pFindInPageAction =
+        new QAction(UIIconPool::iconSet(":/help_browser_search.png"), QString(), this);
 
     connect(m_pHomeAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleHomeAction);
@@ -308 +434 @@
     m_pToolBar->addAction(m_pHomeAction);
     m_pToolBar->addAction(m_pAddBookmarkAction);
+    m_pToolBar->addAction(m_pFindInPageAction);
 
     m_pAddressBar = new QComboBox();
@@ -427 +554 @@
     :QIWithRetranslateUI<QTextBrowser>(pParent)
     , m_pHelpEngine(pHelpEngine)
-{
-    Q_UNUSED(pHelpEngine);
+    , m_pFindInPageWidget(new UIFindInPageWidget(this))
+    , m_fFindWidgetPositioned(false)
+{
+    connect(m_pFindInPageWidget, &UIFindInPageWidget::sigDragging,
+            this, &UIHelpBrowserViewer::sltHandleFindWidgetDrag);
     retranslateUi();
 }
@@ -471 +601 @@
     delete pMenu;
 }
+
+void UIHelpBrowserViewer::paintEvent(QPaintEvent *pEvent)
+{
+    // if (m_pFindInPageWidget)
+    // {
+    //     m_pFindInPageWidget->show();
+    //     m_pFindInPageWidget->update();
+    // }
+    QIWithRetranslateUI<QTextBrowser>::paintEvent(pEvent);
+}
+
+void UIHelpBrowserViewer::resizeEvent(QResizeEvent *pEvent)
+{
+    printf("resize %d\n", width());
+    if (m_pFindInPageWidget && !m_fFindWidgetPositioned)
+    {
+        m_pFindInPageWidget->move(width() - m_pFindInPageWidget->width() - 50, 10);
+        m_fFindWidgetPositioned = true;
+    }
+    QIWithRetranslateUI<QTextBrowser>::resizeEvent(pEvent);
+}
+
 
 void UIHelpBrowserViewer::retranslateUi()
@@ -486 +638 @@
 }
 
+void UIHelpBrowserViewer::sltHandleFindWidgetDrag(const QPoint &delta)
+{
+    if (!m_pFindInPageWidget)
+        return;
+    QRect geo = m_pFindInPageWidget->geometry();
+    geo.translate(delta);
+    int margin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
+    bool fIn = true;
+    if (geo.left() < margin || geo.top() < margin)
+        fIn = false;
+    if (geo.right() > width() - margin || geo.bottom() > height() - margin)
+        fIn = false;
+    if (fIn)
+        m_pFindInPageWidget->move(m_pFindInPageWidget->pos() + delta);
+    update();
+}
 
 /*********************************************************************************************************************************
@@ -559 +727 @@
     }
     return list;
+}
+
+void UIHelpBrowserTabManager::setToolBarVisible(bool fVisible)
+{
+    for (int i = 0; i < count(); ++i)
+    {
+        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(i));
+        if (!pTab)
+            continue;
+        pTab->setToolBarVisible(fVisible);
+    }
 }
 
@@ -636 +815 @@
     , m_pHelpEngine(0)
     , m_pSplitter(0)
-    , m_pMenu(0)
+    , m_pFileMenu(0)
+    , m_pViewMenu(0)
     , m_pContentWidget(0)
     , m_pIndexWidget(0)
@@ -663 +843 @@
 QMenu *UIHelpBrowserWidget::menu() const
 {
-    return m_pMenu;
+    return m_pViewMenu;
 }
 
@@ -764 +944 @@
     AssertReturnVoid(m_pSearchQueryWidget && m_pSearchResultWidget);
     m_pSearchResultWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+    m_pSearchQueryWidget->setCompactMode(false);
 
     QVBoxLayout *pSearchLayout = new QVBoxLayout(m_pSearchContainerWidget);
@@ -827 +1008 @@
 void UIHelpBrowserWidget::prepareMenu()
 {
-    m_pMenu = new QMenu(tr("View"), this);
-    AssertReturnVoid(m_pMenu);
-
-    m_pMenu->addAction(m_pShowHideSideBarAction);
-    m_pMenu->addAction(m_pShowHideToolBarAction);
+    m_pFileMenu = new QMenu(tr("File"), this);
+    m_pViewMenu = new QMenu(tr("View"), this);
+    AssertReturnVoid(m_pViewMenu);
+
+    m_pFileMenu->addAction("asd");
+    m_pViewMenu->addAction(m_pShowHideSideBarAction);
+    m_pViewMenu->addAction(m_pShowHideToolBarAction);
 
 }
@@ -971 +1154 @@
 void UIHelpBrowserWidget::sltHandleToolBarVisibility(bool fToggled)
 {
-    if (m_pToolBar)
-        m_pToolBar->setVisible(fToggled);
+    if (m_pTabManager)
+        m_pTabManager->setToolBarVisible(fToggled);
 }
 
@@ -1060 +1243 @@
             return;
         QPoint browserPos = browser->mapFromGlobal(m_pSearchResultWidget->mapToGlobal(pos));
-        printf("pos %d %d\n", pos.x(), pos.y());
         url = browser->anchorAt(browserPos);
     }

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

@@ -150 +150 @@
     QHelpEngine  *m_pHelpEngine;
     QSplitter           *m_pSplitter;
-    QMenu               *m_pMenu;
+    QMenu               *m_pFileMenu;
+    QMenu               *m_pViewMenu;
     QHelpContentWidget  *m_pContentWidget;
     QHelpIndexWidget    *m_pIndexWidget;