Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

11 files changed, 475 insertions, 298 deletions

diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp
index d60087f..9850ee7 100644
--- a/src/corelib/tools/qpoint.cpp
+++ b/src/corelib/tools/qpoint.cpp
@@ -374,7 +374,7 @@ QDebug operator<<(QDebug dbg, const QPoint &p) {
 QDebug operator<<(QDebug d, const QPointF &p)
 {
     d.nospace() << "QPointF(" << p.x() << ", " << p.y() << ')';
-    return d;
+    return d.space();
 }
 #endif
 
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index b8c9b94..80931c9 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -436,6 +436,23 @@ void QTextDocument::redo(QTextCursor *cursor)
 }
 
 /*!
+    \since 4.7
+    Clears the specified stacks.
+
+    This method clears any commands on the undo stack, the redo stack, or both (the
+    default). If any commands got cleared, the appropriate signals
+    (\a QTextDocument::undoAvailable or \a QTextDocument::redoAvailable) get
+    emitted.
+
+    \sa QTextDocument::undoAvailable QTextDocument::redoAvailable
+*/
+void QTextDocument::clearUndoRedoStacks(Stacks stacksToClear)
+{
+    Q_D(QTextDocument);
+    d->clearUndoRedoStacks(stacksToClear, true);
+}
+
+/*!
     \overload
 
 */
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index b5bcb41..0140772 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -256,6 +256,13 @@ public:
     void undo(QTextCursor *cursor);
     void redo(QTextCursor *cursor);
 
+    enum Stacks {
+        UndoStack = 0x01,
+        RedoStack = 0x02,
+        UndoAndRedoStacks = UndoStack | RedoStack
+    };
+    void clearUndoRedoStacks(Stacks historyToClear = UndoAndRedoStacks);
+
     int maximumBlockCount() const;
     void setMaximumBlockCount(int maximum);
 
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 372b9dc..e2fdf0e 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -260,7 +260,7 @@ void QTextDocumentPrivate::clear()
 
         title.clear();
         undoState = 0;
-        truncateUndoStack();
+        clearUndoRedoStacks(QTextDocument::RedoStack);
         text = QString();
         unreachableCharacterCount = 0;
         modifiedState = 0;
@@ -292,7 +292,7 @@ QTextDocumentPrivate::~QTextDocumentPrivate()
     cursors.clear();
     undoState = 0;
     undoEnabled = true;
-    truncateUndoStack();
+    clearUndoRedoStacks(QTextDocument::RedoStack);
 }
 
 void QTextDocumentPrivate::setLayout(QAbstractTextDocumentLayout *layout)
@@ -1027,7 +1027,7 @@ void QTextDocumentPrivate::appendUndoItem(const QTextUndoCommand &c)
     if (!undoEnabled)
         return;
     if (undoState < undoStack.size())
-        truncateUndoStack();
+        clearUndoRedoStacks(QTextDocument::RedoStack);
 
     if (!undoStack.isEmpty() && modified) {
         QTextUndoCommand &last = undoStack[undoState - 1];
@@ -1050,26 +1050,46 @@ void QTextDocumentPrivate::appendUndoItem(const QTextUndoCommand &c)
         emit document()->undoCommandAdded();
 }
 
-void QTextDocumentPrivate::truncateUndoStack()
+void QTextDocumentPrivate::clearUndoRedoStacks(QTextDocument::Stacks stacksToClear,
+                                               bool emitSignals)
 {
-    if (undoState == undoStack.size())
-        return;
-
-    for (int i = undoState; i < undoStack.size(); ++i) {
-        QTextUndoCommand c = undoStack[i];
-        if (c.command & QTextUndoCommand::Removed) {
-            // ########
-//             QTextFragment *f = c.fragment_list;
-//             while (f) {
-//                 QTextFragment *n = f->right;
-//                 delete f;
-//                 f = n;
-//             }
-        } else if (c.command & QTextUndoCommand::Custom) {
-            delete c.custom;
+    bool undoCommandsAvailable = undoState != 0;
+    bool redoCommandsAvailable = undoState != undoStack.size();
+    if (stacksToClear == QTextDocument::UndoStack && undoCommandsAvailable) {
+        for (int i = 0; i < undoState; ++i) {
+            QTextUndoCommand c = undoStack[undoState];
+            if (c.command & QTextUndoCommand::Custom)
+                delete c.custom;
+        }
+        undoStack.remove(0, undoState);
+        undoStack.resize(undoStack.size() - undoState);
+        undoState = 0;
+        if (emitSignals)
+            emitUndoAvailable(false);
+    } else if (stacksToClear == QTextDocument::RedoStack
+               && redoCommandsAvailable) {
+        for (int i = undoState; i < undoStack.size(); ++i) {
+            QTextUndoCommand c = undoStack[i];
+            if (c.command & QTextUndoCommand::Custom)
+                delete c.custom;
+        }
+        undoStack.resize(undoState);
+        if (emitSignals)
+            emitRedoAvailable(false);
+    } else if (stacksToClear == QTextDocument::UndoAndRedoStacks
+               && (undoCommandsAvailable || redoCommandsAvailable)) {
+        for (int i = 0; i < undoStack.size(); ++i) {
+            QTextUndoCommand c = undoStack[i];
+            if (c.command & QTextUndoCommand::Custom)
+                delete c.custom;
         }
+        undoState = 0;
+        undoStack.resize(0);
+        if (emitSignals && undoCommandsAvailable)
+            emitUndoAvailable(false);
+        if (emitSignals && redoCommandsAvailable)
+            emitRedoAvailable(false);
     }
-    undoStack.resize(undoState);
 }
 
 void QTextDocumentPrivate::emitUndoAvailable(bool available)
@@ -1097,7 +1117,7 @@ void QTextDocumentPrivate::enableUndoRedo(bool enable)
 
     if (!enable) {
         undoState = 0;
-        truncateUndoStack();
+        clearUndoRedoStacks(QTextDocument::RedoStack);
         emitUndoAvailable(false);
         emitRedoAvailable(false);
     }
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h
index 4ecc2fa..ac5ed3c 100644
--- a/src/gui/text/qtextdocument_p.h
+++ b/src/gui/text/qtextdocument_p.h
@@ -252,10 +252,11 @@ public:
     inline QFont defaultFont() const { return formats.defaultFont(); }
     inline void setDefaultFont(const QFont &f) { formats.setDefaultFont(f); }
 
+    void clearUndoRedoStacks(QTextDocument::Stacks stacksToClear, bool emitSignals = false);
+
 private:
     bool split(int pos);
     bool unite(uint f);
-    void truncateUndoStack();
 
     void insert_string(int pos, uint strPos, uint length, int format, QTextUndoCommand::Operation op);
     int insert_block(int pos, uint strPos, int format, int blockformat, QTextUndoCommand::Operation op, int command);
diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro
index e62d30c..edaf076 100644
--- a/tools/assistant/tools/assistant/assistant.pro
+++ b/tools/assistant/tools/assistant/assistant.pro
@@ -25,6 +25,7 @@ HEADERS += aboutdialog.h \
     centralwidget.h \
     cmdlineparser.h \
     contentwindow.h \
+    findwidget.h \
     filternamedialog.h \
     helpenginewrapper.h \
     helpviewer.h \
@@ -50,6 +51,7 @@ SOURCES += aboutdialog.cpp \
     centralwidget.cpp \
     cmdlineparser.cpp \
     contentwindow.cpp \
+    findwidget.cpp \
     filternamedialog.cpp \
     helpenginewrapper.cpp \
     helpviewer.cpp \
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index 8bb2ffe..03af06c 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -41,34 +41,26 @@
 #include "tracer.h"
 
 #include "centralwidget.h"
+#include "findwidget.h"
 #include "helpenginewrapper.h"
 #include "helpviewer.h"
 #include "searchwidget.h"
 #include "mainwindow.h"
-#include "preferencesdialog.h"
 #include "../shared/collectionconfiguration.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QEvent>
 #include <QtCore/QTimer>
 
-#include <QtGui/QMenu>
-#include <QtGui/QLabel>
+#include <QtGui/QApplication>
+#include <QtGui/QKeyEvent>
 #include <QtGui/QLayout>
+#include <QtGui/QMenu>
 #include <QtGui/QPrinter>
-#include <QtGui/QLineEdit>
-#include <QtGui/QCheckBox>
 #include <QtGui/QTabBar>
 #include <QtGui/QTabWidget>
 #include <QtGui/QToolButton>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QTextCursor>
+#include <QtGui/QPageSetupDialog>
 #include <QtGui/QPrintDialog>
-#include <QtGui/QApplication>
-#include <QtGui/QTextDocumentFragment>
 #include <QtGui/QPrintPreviewDialog>
-#include <QtGui/QPageSetupDialog>
 
 #include <QtHelp/QHelpSearchEngine>
 
@@ -88,135 +80,13 @@ namespace {
     CentralWidget *staticCentralWidget = 0;
 }
 
-FindWidget::FindWidget(QWidget *parent)
-    : QWidget(parent)
-    , appPalette(qApp->palette())
-{
-    TRACE_OBJ
-    QHBoxLayout *hboxLayout = new QHBoxLayout(this);
-    QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
-
-#ifndef Q_OS_MAC
-    hboxLayout->setMargin(0);
-    hboxLayout->setSpacing(6);
-    resourcePath.append(QLatin1String("win"));
-#else
-    resourcePath.append(QLatin1String("mac"));
-#endif
-
-    toolClose = setupToolButton(QLatin1String(""),
-        resourcePath + QLatin1String("/closetab.png"));
-    hboxLayout->addWidget(toolClose);
-
-    editFind = new QLineEdit(this);
-    hboxLayout->addWidget(editFind);
-    editFind->setMinimumSize(QSize(150, 0));
-    connect(editFind, SIGNAL(textChanged(QString)), this, SLOT(updateButtons()));
 
-    toolPrevious = setupToolButton(tr("Previous"),
-        resourcePath + QLatin1String("/previous.png"));
-    hboxLayout->addWidget(toolPrevious);
-
-    toolNext = setupToolButton(tr("Next"),
-        resourcePath + QLatin1String("/next.png"));
-    hboxLayout->addWidget(toolNext);
-
-    checkCase = new QCheckBox(tr("Case Sensitive"), this);
-    hboxLayout->addWidget(checkCase);
-
-    checkWholeWords = new QCheckBox(tr("Whole words"), this);
-    hboxLayout->addWidget(checkWholeWords);
-#if !defined(QT_NO_WEBKIT)
-    checkWholeWords->hide();
-#endif
-
-    labelWrapped = new QLabel(this);
-    labelWrapped->setScaledContents(true);
-    labelWrapped->setTextFormat(Qt::RichText);
-    labelWrapped->setMinimumSize(QSize(0, 20));
-    labelWrapped->setMaximumSize(QSize(105, 20));
-    labelWrapped->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
-    labelWrapped->setText(tr("<img src=\":/trolltech/assistant/images/wrap.png\""
-        ">&nbsp;Search wrapped"));
-    hboxLayout->addWidget(labelWrapped);
-
-    QSpacerItem *spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding,
-        QSizePolicy::Minimum);
-    hboxLayout->addItem(spacerItem);
-    setMinimumWidth(minimumSizeHint().width());
-    labelWrapped->hide();
-
-    updateButtons();
-}
-
-FindWidget::~FindWidget()
-{
-    TRACE_OBJ
-}
-
-void FindWidget::hideEvent(QHideEvent* event)
-{
-    TRACE_OBJ
-#if !defined(QT_NO_WEBKIT)
-    // TODO: remove this once webkit supports setting the palette
-    if (!event->spontaneous())
-        qApp->setPalette(appPalette);
-#else
-    Q_UNUSED(event);
-#endif
-}
-
-void FindWidget::showEvent(QShowEvent* event)
-{
-    TRACE_OBJ
-#if !defined(QT_NO_WEBKIT)
-    // TODO: remove this once webkit supports setting the palette
-    if (!event->spontaneous()) {
-        QPalette p = appPalette;
-        p.setColor(QPalette::Inactive, QPalette::Highlight,
-            p.color(QPalette::Active, QPalette::Highlight));
-        p.setColor(QPalette::Inactive, QPalette::HighlightedText,
-            p.color(QPalette::Active, QPalette::HighlightedText));
-        qApp->setPalette(p);
-    }
-#else
-    Q_UNUSED(event);
-#endif
-}
-
-void FindWidget::updateButtons()
-{
-    TRACE_OBJ
-    if (editFind->text().isEmpty()) {
-        toolPrevious->setEnabled(false);
-        toolNext->setEnabled(false);
-    } else {
-        toolPrevious->setEnabled(true);
-        toolNext->setEnabled(true);
-    }
-}
-
-QToolButton* FindWidget::setupToolButton(const QString &text, const QString &icon)
-{
-    TRACE_OBJ
-    QToolButton *toolButton = new QToolButton(this);
-
-    toolButton->setText(text);
-    toolButton->setAutoRaise(true);
-    toolButton->setIcon(QIcon(icon));
-    toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-
-    return toolButton;
-}
-
-
-// --
+// -- CentralWidget
 
 
 CentralWidget::CentralWidget(MainWindow *parent)
     : QWidget(parent)
     , lastTabPage(0)
-    , findBar(0)
     , tabWidget(0)
     , findWidget(0)
     , printer(0)
@@ -260,20 +130,15 @@ CentralWidget::CentralWidget(MainWindow *parent)
 
     vboxLayout->addWidget(tabWidget);
 
-    findBar = new QWidget(this);
-    findWidget = new FindWidget(findBar);
-    findBar->setMinimumHeight(findWidget->minimumSizeHint().height());
-    findWidget->move(0, 0);
-    vboxLayout->addWidget(findBar);
-    findBar->hide();
-    findWidget->editFind->installEventFilter(this);
-
-    connect(findWidget->toolClose, SIGNAL(clicked()), findBar, SLOT(hide()));
-    connect(findWidget->toolNext, SIGNAL(clicked()), this, SLOT(findNext()));
-    connect(findWidget->editFind, SIGNAL(returnPressed()), this, SLOT(findNext()));
-    connect(findWidget->editFind, SIGNAL(textChanged(QString)), this,
-        SLOT(findCurrentText(QString)));
-    connect(findWidget->toolPrevious, SIGNAL(clicked()), this, SLOT(findPrevious()));
+    findWidget = new FindWidget(this);
+    vboxLayout->addWidget(findWidget);
+    findWidget->hide();
+
+    connect(findWidget, SIGNAL(findNext()), this, SLOT(findNext()));
+    connect(findWidget, SIGNAL(findPrevious()), this, SLOT(findPrevious()));
+    connect(findWidget, SIGNAL(find(QString, bool)), this,
+        SLOT(find(QString, bool)));
+    connect(findWidget, SIGNAL(escapePressed()), this, SLOT(activateTab()));
 
     QTabBar *tabBar = qFindChild<QTabBar*>(tabWidget);
     if (tabBar) {
@@ -360,12 +225,6 @@ void CentralWidget::zoomOut()
         m_searchWidget->zoomOut();
 }
 
-void CentralWidget::findNext()
-{
-    TRACE_OBJ
-    find(findWidget->editFind->text(), true);
-}
-
 void CentralWidget::nextPage()
 {
     TRACE_OBJ
@@ -395,12 +254,6 @@ void CentralWidget::previousPage()
     tabWidget->setCurrentIndex(index);
 }
 
-void CentralWidget::findPrevious()
-{
-    TRACE_OBJ
-    find(findWidget->editFind->text(), false);
-}
-
 void CentralWidget::closeTab()
 {
     TRACE_OBJ
@@ -527,9 +380,7 @@ void CentralWidget::copySelection()
 void CentralWidget::showTextSearch()
 {
     TRACE_OBJ
-    findBar->show();
-    findWidget->editFind->selectAll();
-    findWidget->editFind->setFocus(Qt::ShortcutFocusReason);
+    findWidget->show();
 }
 
 void CentralWidget::initPrinter()
@@ -708,12 +559,6 @@ HelpViewer *CentralWidget::newEmptyTab()
     return viewer;
 }
 
-void CentralWidget::findCurrentText(const QString &text)
-{
-    TRACE_OBJ
-    find(text, true);
-}
-
 void CentralWidget::connectSignals()
 {
     TRACE_OBJ
@@ -855,14 +700,6 @@ bool CentralWidget::eventFilter(QObject *object, QEvent *e)
                 return QWidget::eventFilter(object, e);
             }   break;
 
-            case Qt::Key_Escape: {
-                if (findWidget->editFind == object) {
-                    findBar->hide();
-                    if (HelpViewer *viewer = currentHelpViewer())
-                        viewer->setFocus();
-                }
-            }   break;
-
             case Qt::Key_Backspace: {
                 HelpViewer *viewer = currentHelpViewer();
                 if (viewer == object) {
@@ -906,38 +743,43 @@ void CentralWidget::keyPressEvent(QKeyEvent *e)
     TRACE_OBJ
     const QString &text = e->text();
     if (text.startsWith(QLatin1Char('/'))) {
-        if (!findBar->isVisible()) {
-            findBar->show();
-            findWidget->editFind->clear();
+        if (!findWidget->isVisible()) {
+            findWidget->showAndClear();
         } else {
-            findWidget->editFind->selectAll();
+            findWidget->show();
         }
-        findWidget->editFind->setFocus();
-        return;
+    } else {
+        QWidget::keyPressEvent(e);
     }
-    QWidget::keyPressEvent(e);
 }
 
-void CentralWidget::find(const QString &ttf, bool forward)
+void CentralWidget::findNext()
+{
+    find(findWidget->text(), true);
+}
+
+void CentralWidget::findPrevious()
 {
     TRACE_OBJ
-    QPalette p = findWidget->editFind->palette();
-    p.setColor(QPalette::Active, QPalette::Base, Qt::white);
+    find(findWidget->text(), false);
+}
 
+void CentralWidget::find(const QString &ttf, bool forward)
+{
+    TRACE_OBJ
     bool found = false;
-
 #if defined(QT_NO_WEBKIT)
     found = findInTextBrowser(ttf, forward);
 #else
     found = findInWebPage(ttf, forward);
 #endif
 
-    if (!found && !ttf.isEmpty())
-        p.setColor(QPalette::Active, QPalette::Base, QColor(255, 102, 102));
+    if (!found && ttf.isEmpty())
+        found = true;   // the line edit is empty, no need to mark it red...
 
     if (!findWidget->isVisible())
         findWidget->show();
-    findWidget->editFind->setPalette(p);
+    findWidget->setPalette(found);
 }
 
 bool CentralWidget::findInWebPage(const QString &ttf, bool forward)
@@ -951,21 +793,23 @@ bool CentralWidget::findInWebPage(const QString &ttf, bool forward)
             if (!forward)
                 options |= QWebPage::FindBackward;
 
-            if (findWidget->checkCase->isChecked())
+            if (findWidget->caseSensitive())
                 options |= QWebPage::FindCaseSensitively;
 
             found = viewer->findText(ttf, options);
-            findWidget->labelWrapped->hide();
+            findWidget->setTextWrappedVisible(false);
 
             if (!found) {
                 options |= QWebPage::FindWrapsAroundDocument;
                 found = viewer->findText(ttf, options);
                 if (found)
-                    findWidget->labelWrapped->show();
+                    findWidget->setTextWrappedVisible(true);
             }
         }
         // force highlighting of all other matches, also when empty (clear)
         options = QWebPage::HighlightAllOccurrences;
+        if (findWidget->caseSensitive())
+            options |= QWebPage::FindCaseSensitively;
         viewer->findText(QLatin1String(""), options);
         viewer->findText(ttf, options);
         return found;
@@ -1006,13 +850,10 @@ bool CentralWidget::findInTextBrowser(const QString &ttf, bool forward)
     if (!forward)
         options |= QTextDocument::FindBackward;
 
-    if (findWidget->checkCase->isChecked())
+    if (findWidget->caseSensitive())
         options |= QTextDocument::FindCaseSensitively;
 
-    if (findWidget->checkWholeWords->isChecked())
-        options |= QTextDocument::FindWholeWords;
-
-    findWidget->labelWrapped->hide();
+    findWidget->setTextWrappedVisible(false);
 
     bool found = true;
     QTextCursor newCursor = doc->find(ttf, cursor, options);
@@ -1025,7 +866,7 @@ bool CentralWidget::findInTextBrowser(const QString &ttf, bool forward)
             found = false;
             newCursor = cursor;
         } else {
-            findWidget->labelWrapped->show();
+            findWidget->setTextWrappedVisible(true);
         }
     }
     browser->setTextCursor(newCursor);
@@ -1048,6 +889,11 @@ void CentralWidget::updateBrowserFont()
         setBrowserFontFor(tabWidget->widget(i), font);
 }
 
+bool CentralWidget::searchWidgetAttached() const
+{
+    return m_searchWidget && m_searchWidget->isAttached();
+}
+
 void CentralWidget::createSearchWidget(QHelpSearchEngine *searchEngine)
 {
     TRACE_OBJ
diff --git a/tools/assistant/tools/assistant/centralwidget.h b/tools/assistant/tools/assistant/centralwidget.h
index a7c0d6f..6c3e93c 100644
--- a/tools/assistant/tools/assistant/centralwidget.h
+++ b/tools/assistant/tools/assistant/centralwidget.h
@@ -38,72 +38,20 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef CENTRALWIDGET_H
 #define CENTRALWIDGET_H
 
-#include <QtCore/QList>
 #include <QtCore/QUrl>
-#include <QtCore/QPoint>
-#include <QtCore/QObject>
-
 #include <QtGui/QWidget>
 
-#include "searchwidget.h"
-
 QT_BEGIN_NAMESPACE
 
-class QEvent;
-class QLabel;
-class QAction;
-class QCheckBox;
-class QLineEdit;
-class QTextBrowser;
-class QToolButton;
-
+class FindWidget;
 class HelpViewer;
-class QTabWidget;
-class QHelpEngine;
-class CentralWidget;
-class PrintHelper;
 class MainWindow;
-
 class QHelpSearchEngine;
-
-class FindWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    FindWidget(QWidget *parent = 0);
-    ~FindWidget();
-
-signals:
-    void findNext();
-    void findPrevious();
-
-protected:
-    void hideEvent(QHideEvent* event);
-    void showEvent(QShowEvent * event);
-
-private slots:
-    void updateButtons();
-
-private:
-    QToolButton* setupToolButton(const QString &text, const QString &icon);
-
-private:
-    QLineEdit *editFind;
-    QCheckBox *checkCase;
-    QLabel *labelWrapped;
-    QToolButton *toolNext;
-    QToolButton *toolClose;
-    QToolButton *toolPrevious;
-    QCheckBox *checkWholeWords;
-
-    QPalette appPalette;
-    friend class CentralWidget;
-};
+class QTabWidget;
+class SearchWidget;
 
 class CentralWidget : public QWidget
 {
@@ -123,11 +71,8 @@ public:
     QList<QAction*> globalActions() const;
     void setGlobalActions(const QList<QAction*> &actions);
     HelpViewer *currentHelpViewer() const;
-    void activateTab(bool onlyHelpViewer = false);
 
-    bool searchWidgetAttached() const {
-        return m_searchWidget && m_searchWidget->isAttached();
-    }
+    bool searchWidgetAttached() const;
     void createSearchWidget(QHelpSearchEngine *searchEngine);
     void activateSearchWidget(bool updateLastTabPage = false);
     void removeSearchWidget();
@@ -144,11 +89,9 @@ public:
 public slots:
     void zoomIn();
     void zoomOut();
-    void findNext();
     void nextPage();
     void resetZoom();
     void previousPage();
-    void findPrevious();
     void copySelection();
     void showTextSearch();
     void print();
@@ -157,12 +100,17 @@ public slots:
     void updateBrowserFont();
     void setSource(const QUrl &url);
     void setSourceInNewTab(const QUrl &url, qreal zoom = 0.0);
-    void findCurrentText(const QString &text);
     HelpViewer *newEmptyTab();
     void home();
     void forward();
     void backward();
 
+    void activateTab(bool onlyHelpViewer = false);
+
+    void findNext();
+    void findPrevious();
+    void find(const QString &text, bool forward);
+
 signals:
     void currentViewerChanged();
     void copyAvailable(bool yes);
@@ -189,7 +137,6 @@ private slots:
 private:
     void connectSignals();
     bool eventFilter(QObject *object, QEvent *e);
-    void find(const QString &ttf, bool forward);
     bool findInWebPage(const QString &ttf, bool forward);
     bool findInTextBrowser(const QString &ttf, bool forward);
     void initPrinter();
@@ -203,7 +150,6 @@ private:
     int lastTabPage;
     QList<QAction*> globalActionList;
 
-    QWidget *findBar;
     QTabWidget *tabWidget;
     FindWidget *findWidget;
     QPrinter *printer;
diff --git a/tools/assistant/tools/assistant/findwidget.cpp b/tools/assistant/tools/assistant/findwidget.cpp
new file mode 100644
index 0000000..2e40ab0
--- /dev/null
+++ b/tools/assistant/tools/assistant/findwidget.cpp
@@ -0,0 +1,233 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Assistant of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "tracer.h"
+#include "findwidget.h"
+
+#include <QtGui/QApplication>
+#include <QtGui/QCheckBox>
+#include <QtGui/QHideEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QLineEdit>
+#include <QtGui/QToolButton>
+
+QT_BEGIN_NAMESPACE
+
+FindWidget::FindWidget(QWidget *parent)
+    : QWidget(parent)
+    , appPalette(qApp->palette())
+{
+    TRACE_OBJ
+    installEventFilter(this);
+    QHBoxLayout *hboxLayout = new QHBoxLayout(this);
+    QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
+
+#ifndef Q_OS_MAC
+    hboxLayout->setMargin(0);
+    hboxLayout->setSpacing(6);
+    resourcePath.append(QLatin1String("win"));
+#else
+    resourcePath.append(QLatin1String("mac"));
+#endif
+
+    toolClose = setupToolButton(QLatin1String(""),
+        resourcePath + QLatin1String("/closetab.png"));
+    hboxLayout->addWidget(toolClose);
+
+    editFind = new QLineEdit(this);
+    hboxLayout->addWidget(editFind);
+    editFind->setMinimumSize(QSize(150, 0));
+    connect(editFind, SIGNAL(textChanged(QString)), this,
+        SLOT(textChanged(QString)));
+    connect(editFind, SIGNAL(returnPressed()), this, SIGNAL(findNext()));
+    connect(editFind, SIGNAL(textChanged(QString)), this, SLOT(updateButtons()));
+
+    toolPrevious = setupToolButton(tr("Previous"),
+        resourcePath + QLatin1String("/previous.png"));
+    connect(toolPrevious, SIGNAL(clicked()), this, SIGNAL(findPrevious()));
+
+    hboxLayout->addWidget(toolPrevious);
+
+    toolNext = setupToolButton(tr("Next"),
+        resourcePath + QLatin1String("/next.png"));
+    hboxLayout->addWidget(toolNext);
+    connect(toolNext, SIGNAL(clicked()), this, SIGNAL(findNext()));
+
+    checkCase = new QCheckBox(tr("Case Sensitive"), this);
+    hboxLayout->addWidget(checkCase);
+
+    labelWrapped = new QLabel(this);
+    labelWrapped->setScaledContents(true);
+    labelWrapped->setTextFormat(Qt::RichText);
+    labelWrapped->setMinimumSize(QSize(0, 20));
+    labelWrapped->setMaximumSize(QSize(105, 20));
+    labelWrapped->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
+    labelWrapped->setText(tr("<img src=\":/trolltech/assistant/images/wrap.png\""
+        ">&nbsp;Search wrapped"));
+    hboxLayout->addWidget(labelWrapped);
+
+    QSpacerItem *spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding,
+        QSizePolicy::Minimum);
+    hboxLayout->addItem(spacerItem);
+    setMinimumWidth(minimumSizeHint().width());
+    labelWrapped->hide();
+
+    updateButtons();
+}
+
+FindWidget::~FindWidget()
+{
+    TRACE_OBJ
+}
+
+void FindWidget::show()
+{
+    TRACE_OBJ
+    QWidget::show();
+    editFind->selectAll();
+    editFind->setFocus(Qt::ShortcutFocusReason);
+}
+
+void FindWidget::showAndClear()
+{
+    TRACE_OBJ
+    show();
+    editFind->clear();
+}
+
+QString FindWidget::text() const
+{
+    TRACE_OBJ
+    return editFind->text();
+}
+
+bool FindWidget::caseSensitive() const
+{
+    TRACE_OBJ
+    return checkCase->isChecked();
+}
+
+void FindWidget::setPalette(bool found)
+{
+    TRACE_OBJ
+    QPalette palette = editFind->palette();
+    palette.setColor(QPalette::Active, QPalette::Base, found ? Qt::white
+        : QColor(255, 102, 102));
+    editFind->setPalette(palette);
+}
+
+void FindWidget::setTextWrappedVisible(bool visible)
+{
+    TRACE_OBJ
+    labelWrapped->setVisible(visible);
+}
+
+void FindWidget::hideEvent(QHideEvent* event)
+{
+    TRACE_OBJ
+#if !defined(QT_NO_WEBKIT)
+    // TODO: remove this once webkit supports setting the palette
+    if (!event->spontaneous())
+        qApp->setPalette(appPalette);
+#else
+    Q_UNUSED(event);
+#endif
+}
+
+void FindWidget::showEvent(QShowEvent* event)
+{
+    TRACE_OBJ
+#if !defined(QT_NO_WEBKIT)
+    // TODO: remove this once webkit supports setting the palette
+    if (!event->spontaneous()) {
+        QPalette p = appPalette;
+        p.setColor(QPalette::Inactive, QPalette::Highlight,
+            p.color(QPalette::Active, QPalette::Highlight));
+        p.setColor(QPalette::Inactive, QPalette::HighlightedText,
+            p.color(QPalette::Active, QPalette::HighlightedText));
+        qApp->setPalette(p);
+    }
+#else
+    Q_UNUSED(event);
+#endif
+}
+
+void FindWidget::updateButtons()
+{
+    TRACE_OBJ
+    const bool enable = !editFind->text().isEmpty();
+    toolNext->setEnabled(enable);
+    toolPrevious->setEnabled(enable);
+}
+
+void FindWidget::textChanged(const QString &text)
+{
+    TRACE_OBJ
+    emit find(text, true);
+}
+
+bool FindWidget::eventFilter(QObject *object, QEvent *e)
+{
+    TRACE_OBJ
+    if (e->type() == QEvent::KeyPress) {
+        if ((static_cast<QKeyEvent*>(e))->key() == Qt::Key_Escape) {
+            hide();
+            emit escapePressed();
+        }
+    }
+    return QWidget::eventFilter(object, e);
+}
+
+QToolButton* FindWidget::setupToolButton(const QString &text, const QString &icon)
+{
+    TRACE_OBJ
+    QToolButton *toolButton = new QToolButton(this);
+
+    toolButton->setText(text);
+    toolButton->setAutoRaise(true);
+    toolButton->setIcon(QIcon(icon));
+    toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+    return toolButton;
+}
+
+QT_END_NAMESPACE
diff --git a/tools/assistant/tools/assistant/findwidget.h b/tools/assistant/tools/assistant/findwidget.h
new file mode 100644
index 0000000..cf78003
--- /dev/null
+++ b/tools/assistant/tools/assistant/findwidget.h
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Assistant of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef FINDWIDGET_H
+#define FINDWIDGET_H
+
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class QCheckBox;
+class QLabel;
+class QLineEdit;
+class QToolButton;
+
+class FindWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    FindWidget(QWidget *parent = 0);
+    ~FindWidget();
+
+    void show();
+    void showAndClear();
+
+    QString text() const;
+    bool caseSensitive() const;
+
+    void setPalette(bool found);
+    void setTextWrappedVisible(bool visible);
+
+signals:
+    void escapePressed();
+
+    void findNext();
+    void findPrevious();
+    void find(const QString &text, bool forward);
+
+protected:
+    void hideEvent(QHideEvent* event);
+    void showEvent(QShowEvent * event);
+
+private slots:
+    void updateButtons();
+    void textChanged(const QString &text);
+
+private:
+    bool eventFilter(QObject *object, QEvent *e);
+    QToolButton* setupToolButton(const QString &text, const QString &icon);
+
+private:
+    QPalette appPalette;
+
+    QLineEdit *editFind;
+    QCheckBox *checkCase;
+    QLabel *labelWrapped;
+    QToolButton *toolNext;
+    QToolButton *toolClose;
+    QToolButton *toolPrevious;
+};
+
+QT_END_NAMESPACE
+
+#endif  // FINDWIDGET_H
diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp
index ddc056a..76211c5 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp
@@ -103,7 +103,7 @@ private:
     HelpEngineWrapperPrivate(const QString &collectionFile);
 
     void initFileSystemWatchers();
-    void assertDocFilesWatched();
+    void checkDocFilesWatched();
     void qchFileChanged(const QString &fileName, bool fromTimeout);
 
     static const int UpdateGracePeriod = 2000;
@@ -202,23 +202,23 @@ const QString HelpEngineWrapper::collectionFile() const
 bool HelpEngineWrapper::registerDocumentation(const QString &docFile)
 {
     TRACE_OBJ
-    d->assertDocFilesWatched();
+    d->checkDocFilesWatched();
     if (!d->m_helpEngine->registerDocumentation(docFile))
         return false;
     d->m_qchWatcher->addPath(docFile);
-    d->assertDocFilesWatched();
+    d->checkDocFilesWatched();
     return true;
 }
 
 bool HelpEngineWrapper::unregisterDocumentation(const QString &namespaceName)
 {
     TRACE_OBJ
-    d->assertDocFilesWatched();
+    d->checkDocFilesWatched();
     const QString &file = d->m_helpEngine->documentationFileName(namespaceName);
     if (!d->m_helpEngine->unregisterDocumentation(namespaceName))
         return false;
     d->m_qchWatcher->removePath(file);
-    d->assertDocFilesWatched();
+    d->checkDocFilesWatched();
     return true;
 }
 
@@ -715,7 +715,7 @@ void HelpEngineWrapperPrivate::initFileSystemWatchers()
         connect(m_qchWatcher, SIGNAL(fileChanged(QString)),
                 this, SLOT(qchFileChanged(QString)));
     }
-    assertDocFilesWatched();
+    checkDocFilesWatched();
 }
 
 void HelpEngineWrapperPrivate::qchFileChanged(const QString &fileName)
@@ -724,11 +724,15 @@ void HelpEngineWrapperPrivate::qchFileChanged(const QString &fileName)
     qchFileChanged(fileName, false);
 }
 
-void HelpEngineWrapperPrivate::assertDocFilesWatched()
+void HelpEngineWrapperPrivate::checkDocFilesWatched()
 {
     TRACE_OBJ
-    Q_ASSERT(m_qchWatcher->files().count()
-             == m_helpEngine->registeredDocumentations().count());
+    const int watchedFilesCount = m_qchWatcher->files().count();
+    const int docFilesCount = m_helpEngine->registeredDocumentations().count();
+    if (watchedFilesCount != docFilesCount) {
+        qWarning("Strange: Have %d docs, but %d are being watched",
+                 watchedFilesCount, docFilesCount);
+    }
 }
 
 void HelpEngineWrapperPrivate::qchFileChanged(const QString &fileName,