for fakevim mode, terminate incremental search after pressing enter/return

Merge-request: 97
Reviewed-by: hjk <qtc-committer@nokia.com>
This commit is contained in:
Martin Aumüller
2010-01-21 17:23:31 +01:00
committed by hjk
parent de21fef76c
commit 474d883eac
6 changed files with 45 additions and 4 deletions

View File

@@ -31,6 +31,7 @@
#include "textfindconstants.h"
#include "currentdocumentfind.h"
#include "findtoolbar.h"
#include "findtoolwindow.h"
#include "searchresultwindow.h"
@@ -70,6 +71,8 @@ namespace {
using namespace Find;
using namespace Find::Internal;
FindPlugin *FindPlugin::m_instance = 0;
FindPlugin::FindPlugin()
: m_currentDocumentFind(0),
m_findToolBar(0),
@@ -77,15 +80,23 @@ FindPlugin::FindPlugin()
m_findCompletionModel(new QStringListModel(this)),
m_replaceCompletionModel(new QStringListModel(this))
{
QTC_ASSERT(!m_instance, return);
m_instance = this;
}
FindPlugin::~FindPlugin()
{
m_instance = 0;
delete m_currentDocumentFind;
delete m_findToolBar;
delete m_findDialog;
}
FindPlugin *FindPlugin::instance()
{
return m_instance;
}
bool FindPlugin::initialize(const QStringList &, QString *)
{
setupMenu();
@@ -297,4 +308,10 @@ void FindPlugin::updateCompletion(const QString &text, QStringList &completions,
model->setStringList(completions);
}
void FindPlugin::setUseFakeVim(bool on)
{
if (m_findToolBar)
m_findToolBar->setUseFakeVim(on);
}
Q_EXPORT_PLUGIN(FindPlugin)