FindBar. Rewamped and restored

1 files changed, 16 insertions, 0 deletions

diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index 87006bf8..0af79cb6 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -39,6 +39,7 @@
 #include "webtab.h"
 
 #include "bookmarkstoolbar.h"
+#include "findbar.h"
 #include "rekonqfactory.h"
 #include "rekonqmenu.h"
 #include "settingsdialog.h"
@@ -72,6 +73,7 @@ WebWindow::WebWindow(QWidget *parent, WebPage *pg)
     , _bar(new UrlBar(_tab))
     , _mainToolBar(0)
     , _bookmarksBar(0)
+    , m_findBar(new FindBar(this))
     , m_loadStopReloadAction(0)
     , m_rekonqMenu(0)
     , m_popup(new QLabel(this))
@@ -101,6 +103,7 @@ WebWindow::WebWindow(QWidget *parent, WebPage *pg)
     l->addWidget(_mainToolBar);
     l->addWidget(_bookmarksBar);
     l->addWidget(_tab);
+    l->addWidget(m_findBar);
     l->setContentsMargins(0, 0, 0, 0);
 
     setContentsMargins(0, 0, 0, 0);
@@ -128,6 +131,14 @@ WebWindow::WebWindow(QWidget *parent, WebPage *pg)
 }
 
 
+WebWindow::~WebWindow()
+{
+    m_hidePopupTimer->stop();
+
+    BookmarkManager::self()->removeBookmarkBar(_bookmarksBar);
+}
+
+
 void WebWindow::setupActions()
 {
     KAction *a;
@@ -178,6 +189,11 @@ void WebWindow::setupActions()
     KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
     KStandardAction::quit(rApp, SLOT(queryQuit()), actionCollection());
 
+    // find action
+    a = KStandardAction::find(m_findBar, SLOT(show()), actionCollection());
+    KShortcut findShortcut = KStandardShortcut::find();
+    a->setShortcut(findShortcut);
+
     a = KStandardAction::fullScreen(this, SLOT(viewFullScreen(bool)), this, actionCollection());
     KShortcut fullScreenShortcut = KStandardShortcut::fullScreen();
     fullScreenShortcut.setAlternate(Qt::Key_F11);