Merge branch 'opensearch'

Conflicts:
	src/CMakeLists.txt
	src/urlbar/urlresolver.cpp

20 files changed, 1435 insertions, 109 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 151906b9..cc381c94 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,6 @@ SET( rekonq_KDEINIT_SRCS
     websnap.cpp
     webview.cpp
     webtab.cpp
-    searchengine.cpp
     #----------------------------------------
     history/autosaver.cpp
     history/historymanager.cpp
@@ -69,6 +68,12 @@ SET( rekonq_KDEINIT_SRCS
     #----------------------------------------
     analyzer/analyzerpanel.cpp
     analyzer/networkanalyzer.cpp
+    #----------------------------------------
+    search/searchengine.cpp
+    search/opensearchwriter.cpp
+    search/opensearchreader.cpp
+    search/opensearchmanager.cpp
+    search/opensearchengine.cpp
 )
 
 
@@ -94,6 +99,7 @@ INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_SOURCE_DIR}
                         ${CMAKE_CURRENT_SOURCE_DIR}/rekonqpage
                         ${CMAKE_CURRENT_SOURCE_DIR}/settings
                         ${CMAKE_CURRENT_SOURCE_DIR}/analyzer
+                        ${CMAKE_CURRENT_SOURCE_DIR}/search
                         ${CMAKE_CURRENT_BINARY_DIR}
                         ${KDE4_INCLUDES}
                         ${QT4_INCLUDES}
@@ -112,8 +118,9 @@ KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp )
 ### --------------- TARGETTING LINK LIBRARIES...
 
 TARGET_LINK_LIBRARIES ( kdeinit_rekonq
-                        ${QT_LIBRARIES}
-                        ${QT_QTWEBKIT_LIBRARY}
+                        ${QT_LIBRARIES} 
+                        ${QT_QTSCRIPT_LIBRARY}
+                        ${QT_QTWEBKIT_LIBRARY} 
                         ${KDE4_KDEWEBKIT_LIBS}
                         ${KDE4_KUTILS_LIBS}
                         ${KDE4_KDEUI_LIBS}
diff --git a/src/application.cpp b/src/application.cpp
index 5cc3b460..065c0ef2 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -42,6 +42,7 @@
 #include "urlbar.h"
 #include "sessionmanager.h"
 #include "adblockmanager.h"
+#include "opensearchmanager.h"
 #include "webview.h"
 #include "filterurljob.h"
 #include "tabbar.h"
@@ -64,6 +65,7 @@ QWeakPointer<HistoryManager> Application::s_historyManager;
 QWeakPointer<BookmarkProvider> Application::s_bookmarkProvider;
 QWeakPointer<SessionManager> Application::s_sessionManager;
 QWeakPointer<AdBlockManager> Application::s_adblockManager;
+QWeakPointer<OpenSearchManager> Application::s_opensearchManager;
 
 
 Application::Application()
@@ -98,6 +100,9 @@ Application::~Application()
 
     delete s_adblockManager.data();
     s_adblockManager.clear();
+    
+    delete s_opensearchManager.data();
+    s_opensearchManager.clear();
 }
 
 
@@ -315,6 +320,17 @@ SessionManager *Application::sessionManager()
 }
 
 
+OpenSearchManager *Application::opensearchManager()
+{
+    if (s_opensearchManager.isNull())
+    {
+        s_opensearchManager = new OpenSearchManager(instance());
+        s_opensearchManager.data()->setSearchProvider("google"); //TODO: use other suggestion engines
+    }
+    return s_opensearchManager.data();
+}
+
+
 KIcon Application::icon(const KUrl &url)
 {
     // avoid infinite loop at startup
diff --git a/src/application.h b/src/application.h
index 18c99afb..a08d883c 100644
--- a/src/application.h
+++ b/src/application.h
@@ -33,6 +33,8 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+#include "opensearchmanager.h"
+
 // KDE Includes
 #include <KUniqueApplication>
 #include <KIcon>
@@ -111,6 +113,7 @@ public:
     static BookmarkProvider *bookmarkProvider();
     static SessionManager *sessionManager();
     static AdBlockManager *adblockManager();
+    static OpenSearchManager *opensearchManager();
 
     // DOWNLOADS MANAGEMENT METHODS
     void addDownload(const QString &srcUrl, const QString &destUrl);
@@ -148,6 +151,7 @@ private:
     static QWeakPointer<BookmarkProvider> s_bookmarkProvider;
     static QWeakPointer<SessionManager> s_sessionManager;
     static QWeakPointer<AdBlockManager> s_adblockManager;
+    static QWeakPointer<OpenSearchManager> s_opensearchManager;
 
     MainWindowList m_mainWindows;
 };
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 5f0ac164..ed1ada34 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -1,3 +1,4 @@
+# image files
 INSTALL( 
     FILES 
     bg2.png bg.png tile.gif category.png button.png
@@ -6,20 +7,30 @@ INSTALL(
     DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics
 )
 
+# default bookmarks
 INSTALL( 
     FILES 
     defaultbookmarks.xbel
     DESTINATION ${DATA_INSTALL_DIR}/rekonq
 )
 
+# .desktop file
 INSTALL( 
     FILES rekonq.desktop 
     DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
 
+# htmls
 INSTALL( 
     FILES 
     rekonqinfo.html 
     home.html
     DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls
 )
+
+# opensearch engines
+INSTALL( 
+    FILES 
+    google.xml
+    DESTINATION ${DATA_INSTALL_DIR}/rekonq/opensearch
+)
diff --git a/src/data/google.xml b/src/data/google.xml
new file mode 100644
index 00000000..622a0737
--- /dev/null
+++ b/src/data/google.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+    <ShortName>Google</ShortName>
+    <Description>Google Web Search</Description>
+    <Url method="get" type="text/html" template="http://www.google.com/search?hl={language}&amp;lr=lang_{language}&amp;q={searchTerms}"/>
+    <Url method="get" type="application/x-suggestions+json" template="http://suggestqueries.google.com/complete/search?json=t&amp;hl={language}&amp;q={searchTerms}&amp;nolabels=t"/>
+    <Image width="16" height="16">http://www.google.com/favicon.ico</Image>
+</OpenSearchDescription>
+
diff --git a/src/search/opensearchengine.cpp b/src/search/opensearchengine.cpp
new file mode 100644
index 00000000..78e50980
--- /dev/null
+++ b/src/search/opensearchengine.cpp
@@ -0,0 +1,274 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Jakub Wieczorek <faw217@gmail.com>
+* Copyright (C) 2009 by Christian Franke <cfchris6@ts2server.com>
+* Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com>
+* Copyright (C) 2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "opensearchengine.h"
+
+// Qt Includes
+#include <QtCore/QRegExp>
+#include <QtCore/QStringList>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValue>
+
+
+OpenSearchEngine::OpenSearchEngine(QObject *)
+    : m_scriptEngine(0)
+{
+}
+
+
+OpenSearchEngine::~OpenSearchEngine()
+{
+    if (m_scriptEngine) 
+    {
+        delete m_scriptEngine;
+    }
+}
+
+
+QString OpenSearchEngine::parseTemplate(const QString &searchTerm, const QString &searchTemplate)
+{
+    QString result = searchTemplate;
+    result.replace(QL1S("{count}"), QL1S("20"));
+    result.replace(QL1S("{startIndex}"), QL1S("0"));
+    result.replace(QL1S("{startPage}"), QL1S("0"));
+    // TODO - get setting from KDE
+    result.replace(QL1S("{language}"), QL1S("en-US"));
+    result.replace(QL1S("{inputEncoding}"), QL1S("UTF-8"));
+    result.replace(QL1S("{outputEncoding}"), QL1S("UTF-8"));
+    result.replace(QL1S("{searchTerms}"), searchTerm);
+
+    return result;
+}
+
+
+QString OpenSearchEngine::name() const
+{
+    return m_name;
+}
+
+
+void OpenSearchEngine::setName(const QString &name)
+{
+    m_name = name;
+}
+
+
+QString OpenSearchEngine::description() const
+{
+    return m_description;
+}
+
+
+void OpenSearchEngine::setDescription(const QString &description)
+{
+    m_description = description;
+}
+
+
+QString OpenSearchEngine::searchUrlTemplate() const
+{
+    return m_searchUrlTemplate;
+}
+
+
+void OpenSearchEngine::setSearchUrlTemplate(const QString &searchUrlTemplate)
+{
+    m_searchUrlTemplate = searchUrlTemplate;
+}
+
+
+KUrl OpenSearchEngine::searchUrl(const QString &searchTerm) const
+{
+    if (m_searchUrlTemplate.isEmpty()) 
+    {
+        return KUrl();
+    }
+
+    KUrl retVal = KUrl::fromEncoded(parseTemplate(searchTerm, m_searchUrlTemplate).toUtf8());
+
+    QList<Parameter>::const_iterator i;
+    for ( i = m_searchParameters.constBegin(); i != m_searchParameters.constEnd(); ++i) 
+    {
+        retVal.addQueryItem(i->first, parseTemplate(searchTerm, i->second));
+    }
+
+    return retVal;
+}
+
+
+bool OpenSearchEngine::providesSuggestions() const
+{
+    return !m_suggestionsUrlTemplate.isEmpty();
+}
+
+
+QString OpenSearchEngine::suggestionsUrlTemplate() const
+{
+    return m_suggestionsUrlTemplate;
+}
+
+
+void OpenSearchEngine::setSuggestionsUrlTemplate(const QString &suggestionsUrlTemplate)
+{
+    m_suggestionsUrlTemplate = suggestionsUrlTemplate;
+}
+
+
+KUrl OpenSearchEngine::suggestionsUrl(const QString &searchTerm) const
+{
+    if (m_suggestionsUrlTemplate.isEmpty()) 
+    {
+        return KUrl();
+    }
+
+    KUrl retVal = KUrl::fromEncoded(parseTemplate(searchTerm, m_suggestionsUrlTemplate).toUtf8());
+
+    QList<Parameter>::const_iterator i;
+    for( i = m_suggestionsParameters.constBegin(); i != m_suggestionsParameters.constEnd(); ++i)
+    {
+        retVal.addQueryItem(i->first, parseTemplate(searchTerm, i->second));
+    }
+    return retVal;
+}
+
+
+QList<OpenSearchEngine::Parameter> OpenSearchEngine::searchParameters() const
+{
+    return m_searchParameters;
+}
+
+
+void OpenSearchEngine::setSearchParameters(const QList<Parameter> &searchParameters)
+{
+    m_searchParameters = searchParameters;
+}
+
+
+QList<OpenSearchEngine::Parameter> OpenSearchEngine::suggestionsParameters() const
+{
+    return m_suggestionsParameters;
+}
+
+
+void OpenSearchEngine::setSuggestionsParameters(const QList<Parameter> &suggestionsParameters)
+{
+    m_suggestionsParameters = suggestionsParameters;
+}
+
+
+QString OpenSearchEngine::imageUrl() const
+{
+    return m_imageUrl;
+}
+
+
+void OpenSearchEngine::setImageUrl(const QString &imageUrl)
+{
+    m_imageUrl = imageUrl;
+}
+
+
+QImage OpenSearchEngine::image() const
+{
+    return m_image;
+}
+
+
+void OpenSearchEngine::setImage(const QImage &image)
+{
+    m_image = image;
+}
+
+
+bool OpenSearchEngine::isValid() const
+{
+    return (!m_name.isEmpty() && !m_searchUrlTemplate.isEmpty());
+}
+
+
+bool OpenSearchEngine::operator==(const OpenSearchEngine &other) const
+{
+    return (m_name == other.m_name
+            && m_description == other.m_description
+            && m_imageUrl == other.m_imageUrl
+            && m_searchUrlTemplate == other.m_searchUrlTemplate
+            && m_suggestionsUrlTemplate == other.m_suggestionsUrlTemplate
+            && m_searchParameters == other.m_searchParameters
+            && m_suggestionsParameters == other.m_suggestionsParameters);
+}
+
+
+bool OpenSearchEngine::operator<(const OpenSearchEngine &other) const
+{
+    return (m_name < other.m_name);
+}
+
+
+QStringList OpenSearchEngine::parseSuggestion(const QByteArray &resp)
+{
+    QString response = QString::fromLocal8Bit(resp);
+    response = response.trimmed();
+
+    if (response.isEmpty()) 
+    {
+        return QStringList();
+    }
+
+    if (    !response.startsWith(QL1C('[')) 
+         || !response.endsWith(QL1C(']'))
+       ) 
+    {
+        return QStringList();
+    }
+
+    if (!m_scriptEngine) 
+    {
+        m_scriptEngine = new QScriptEngine();
+    }
+
+    // Evaluate the JSON response using QtScript.
+    if (!m_scriptEngine->canEvaluate(response)) 
+    {
+        return QStringList();
+    }
+
+    QScriptValue responseParts = m_scriptEngine->evaluate(response);
+
+    if (!responseParts.property(1).isArray()) 
+    {
+        return QStringList();
+    }
+
+    QStringList suggestionsList;
+    qScriptValueToSequence(responseParts.property(1), suggestionsList);
+
+    return suggestionsList;
+}
diff --git a/src/search/opensearchengine.h b/src/search/opensearchengine.h
new file mode 100644
index 00000000..f2329624
--- /dev/null
+++ b/src/search/opensearchengine.h
@@ -0,0 +1,110 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Jakub Wieczorek <faw217@gmail.com>
+* Copyright (C) 2009 by Christian Franke <cfchris6@ts2server.com>
+* Copyright (C) 2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef OPENSEARCHENGINE_H
+#define OPENSEARCHENGINE_H
+
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// KDE Includes
+#include <KUrl>
+
+// Qt Includes
+#include <QtCore/QPair>
+#include <QtGui/QImage>
+
+// Forward Declarations
+class QNetworkAccessManager;
+class QNetworkReply;
+class QScriptEngine;
+
+
+class OpenSearchEngine
+{
+public:
+    typedef QPair<QString, QString> Parameter;
+
+    OpenSearchEngine(QObject *parent = 0);
+    ~OpenSearchEngine();
+
+    QString name() const;
+    void setName(const QString &name);
+
+    QString description() const;
+    void setDescription(const QString &description);
+
+    QString searchUrlTemplate() const;
+    void setSearchUrlTemplate(const QString &searchUrl);
+    KUrl searchUrl(const QString &searchTerm) const;
+
+    bool providesSuggestions() const;
+
+    QString suggestionsUrlTemplate() const;
+    void setSuggestionsUrlTemplate(const QString &suggestionsUrl);
+    KUrl suggestionsUrl(const QString &searchTerm) const;
+
+    QList<Parameter> searchParameters() const;
+    void setSearchParameters(const QList<Parameter> &searchParameters);
+
+    QList<Parameter> suggestionsParameters() const;
+    void setSuggestionsParameters(const QList<Parameter> &suggestionsParameters);
+
+    QString imageUrl() const;
+    void setImageUrl(const QString &url);
+
+    QImage image() const;
+    void setImage(const QImage &image);
+
+    bool isValid() const;
+
+    bool operator==(const OpenSearchEngine &other) const;
+    bool operator<(const OpenSearchEngine &other) const;
+
+    QStringList parseSuggestion(const QByteArray &response);
+
+    static QString parseTemplate(const QString &searchTerm, const QString &searchTemplate);
+
+private:
+    QString m_name;
+    QString m_description;
+
+    QString m_imageUrl;
+    QImage m_image;
+
+    QString m_searchUrlTemplate;
+    QString m_suggestionsUrlTemplate;
+    QList<Parameter> m_searchParameters;
+    QList<Parameter> m_suggestionsParameters;
+
+    QScriptEngine *m_scriptEngine;
+};
+
+#endif // OPENSEARCHENGINE_H
diff --git a/src/search/opensearchmanager.cpp b/src/search/opensearchmanager.cpp
new file mode 100644
index 00000000..463c0a11
--- /dev/null
+++ b/src/search/opensearchmanager.cpp
@@ -0,0 +1,213 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com>
+* Copyright (C) 2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "opensearchmanager.h"
+#include "opensearchmanager.moc"
+
+// Local Includes
+#include "opensearchengine.h"
+#include "opensearchreader.h"
+#include "opensearchwriter.h"
+
+// KDE Includes
+#include <KDebug>
+#include <KGlobal>
+#include <KStandardDirs>
+#include <KUrl>
+#include <kio/scheduler.h>
+
+// Qt Includes
+#include <QtCore/QFile>
+
+
+OpenSearchManager::OpenSearchManager(QObject *parent)
+    : QObject(parent)
+    , m_activeEngine(0)
+{
+    m_state = IDLE;
+}
+
+
+OpenSearchManager::~OpenSearchManager() 
+{
+    qDeleteAll(m_enginesMap.values());
+    m_enginesMap.clear();
+}
+
+
+void OpenSearchManager::setSearchProvider(const QString &searchProvider)
+{
+    m_activeEngine = 0;
+
+    if (!m_enginesMap.contains(searchProvider)) 
+    {
+        const QString fileName = KGlobal::dirs()->findResource("data", "rekonq/opensearch/" + searchProvider + ".xml");
+        kDebug() << searchProvider <<  " file name path: " << fileName;
+        if (fileName.isEmpty()) 
+        {
+            kDebug() << "OpenSearch file name empty";
+            return;
+        }
+        QFile file(fileName);
+
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) 
+        {
+            kDebug() << "Cannot open opensearch description file: " + fileName;
+            return;
+        }
+
+        OpenSearchReader reader;
+        OpenSearchEngine *engine = reader.read(&file);
+
+        if (engine) 
+        {
+            m_enginesMap.insert(searchProvider, engine);
+        }
+        else 
+        {
+            return;
+        }
+    }
+
+    m_activeEngine = m_enginesMap.value(searchProvider);
+}
+
+
+bool OpenSearchManager::isSuggestionAvailable()
+{
+    return m_activeEngine != 0;
+}
+
+
+void OpenSearchManager::addOpenSearchEngine(const KUrl &url, const QString &title)
+{
+    Q_UNUSED(title);
+
+    m_jobData.clear();
+
+    if (m_state != IDLE) 
+    {
+        // TODO: cancel job
+    }
+
+    m_state = REQ_DESCRIPTION;
+    KIO::TransferJob *job = KIO::get(url, KIO::NoReload, KIO::HideProgressInfo);
+    connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)), this, SLOT(dataReceived(KIO::Job *, const QByteArray &)));
+    connect(job, SIGNAL(result(KJob *)), this, SLOT(jobFinished(KJob *)));
+}
+
+
+void OpenSearchManager::requestSuggestion(const QString &searchText)
+{
+    if (!m_activeEngine) 
+        return;
+
+    if (m_state != IDLE) 
+    {
+        // TODO: cancel job
+    }
+    m_state = REQ_SUGGESTION;
+
+    KUrl url = m_activeEngine->suggestionsUrl(searchText);
+    kDebug() << "Requesting for suggestions: " << url.url();
+    m_jobData.clear();
+    
+    KIO::TransferJob *job = KIO::get(url, KIO::NoReload, KIO::HideProgressInfo);
+    connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)), this, SLOT(dataReceived(KIO::Job *, const QByteArray &)));
+    connect(job, SIGNAL(result(KJob *)), this, SLOT(jobFinished(KJob *)));
+}
+
+
+void OpenSearchManager::dataReceived(KIO::Job *job, const QByteArray &data)
+{
+    Q_UNUSED(job);
+    m_jobData.append(data);
+}
+
+
+void OpenSearchManager::jobFinished(KJob *job)
+{
+    if (job->error())
+        return; // just silently return
+
+    if (m_state == REQ_SUGGESTION) 
+    {
+        const QStringList suggestionsList = m_activeEngine->parseSuggestion(m_jobData);
+        kDebug() << "Received suggestion from " << m_activeEngine->name() << ": " << suggestionsList;
+
+        emit suggestionReceived(suggestionsList);
+        return;
+    }
+
+    if (m_state == REQ_DESCRIPTION) 
+    {
+        OpenSearchReader reader;
+        OpenSearchEngine *engine = reader.read(m_jobData);
+        if (engine) 
+        {
+            m_enginesMap.insert(engine->name(), engine);
+            QString path = KGlobal::dirs()->findResource("data", "rekonq/opensearch/");
+            QString fileName = trimmedEngineName(engine->name());
+            QFile file(path + fileName + ".xml");
+            OpenSearchWriter writer;
+            writer.write(&file, engine);
+
+            QString searchUrl = OpenSearchEngine::parseTemplate("\\{@}", engine->searchUrlTemplate());
+            emit openSearchEngineAdded(engine->name(), searchUrl, fileName);
+        }
+        else 
+        {
+            kFatal() << "Error while adding new open search engine";
+        }
+    }
+}
+
+
+QString OpenSearchManager::trimmedEngineName(const QString &engineName) const
+{
+    QString trimmed;
+    QString::ConstIterator constIter = engineName.constBegin();
+    while (constIter != engineName.constEnd()) 
+    {
+        if (constIter->isSpace()) 
+        {
+            trimmed.append('-');
+        }
+        else 
+        {
+            if (*constIter != '.') 
+            {
+                trimmed.append(constIter->toLower());
+            }
+        }
+        constIter++;
+    }
+
+    return trimmed;
+}
diff --git a/src/search/opensearchmanager.h b/src/search/opensearchmanager.h
new file mode 100644
index 00000000..8a45b83c
--- /dev/null
+++ b/src/search/opensearchmanager.h
@@ -0,0 +1,108 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com>
+* Copyright (C) 2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef OPENSEARCHMANAGER_H
+#define OPENSEARCHMANAGER_H
+
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// KDE Includes
+#include <kio/jobclasses.h>
+
+// Qt Includes
+#include <QtCore/QObject>
+
+// Forward Declarations
+class SuggestionEngine;
+class OpenSearchEngine;
+
+
+/**
+ * This class acts as a proxy between the SearchBar plugin 
+ * and the individual suggestion engine.
+ * This class has a map of all available engines, 
+ * and route the suggestion request to the correct engine.
+ */
+class OpenSearchManager : public QObject
+{
+    Q_OBJECT
+
+    enum STATE 
+    {
+        REQ_SUGGESTION,
+        REQ_DESCRIPTION,
+        IDLE
+    };
+    
+public:
+    /**
+     * Constructor
+     */
+    explicit OpenSearchManager(QObject *parent = 0);
+
+    virtual ~OpenSearchManager();
+
+    void setSearchProvider(const QString &searchProvider);
+
+    /**
+     * Check whether a search suggestion engine is available for the given search provider
+     * @param searchProvider the queried search provider
+     */
+    bool isSuggestionAvailable();
+
+    void addOpenSearchEngine(const KUrl &url, const QString &title);
+
+public slots:
+    /**
+     * Ask the specific suggestion engine to request for suggestion for the search text
+     * @param searchProvider the search provider that provides the suggestion service
+     * @param searchText the text to be queried to the suggestion service
+     */
+    void requestSuggestion(const QString &searchProvider);
+
+private slots:
+    void dataReceived(KIO::Job *job, const QByteArray &data);
+    void jobFinished(KJob *job);
+
+signals:
+    void suggestionReceived(const QStringList &suggestion);
+    void openSearchEngineAdded(const QString &name, const QString &searchUrl, const QString &fileName);
+
+private:
+    QString trimmedEngineName(const QString &engineName) const;
+
+    // QString substitutueSearchText(const QString &searchText, const QString &requestURL) const;
+    QByteArray m_jobData;
+    QMap<QString, OpenSearchEngine*> m_enginesMap;
+    OpenSearchEngine *m_activeEngine;
+    STATE m_state;
+};
+
+#endif // OPENSEARCHMANAGER_H
diff --git a/src/search/opensearchreader.cpp b/src/search/opensearchreader.cpp
new file mode 100644
index 00000000..5b7ece2c
--- /dev/null
+++ b/src/search/opensearchreader.cpp
@@ -0,0 +1,174 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Jakub Wieczorek <faw217@gmail.com>
+* Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com>
+* Copyright (C) 2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "opensearchreader.h"
+
+// Local Includes
+#include "opensearchengine.h"
+
+// Qt Includes
+#include <QtCore/QIODevice>
+
+
+OpenSearchReader::OpenSearchReader()
+    : QXmlStreamReader()
+{
+}
+
+
+OpenSearchEngine *OpenSearchReader::read(const QByteArray &data)
+{
+    clear();
+    addData(data);
+
+    return read();
+}
+
+
+OpenSearchEngine *OpenSearchReader::read(QIODevice *device)
+{
+    clear();
+
+    if (!device->isOpen()) 
+    {
+        device->open(QIODevice::ReadOnly);
+    }
+
+    setDevice(device);
+    return read();
+}
+
+
+OpenSearchEngine *OpenSearchReader::read()
+{
+    OpenSearchEngine *engine = new OpenSearchEngine();
+
+    while (!isStartElement() && !atEnd()) {
+        readNext();
+    }
+
+    if (    name() != QL1S("OpenSearchDescription")
+         || namespaceUri() != QL1S("http://a9.com/-/spec/opensearch/1.1/")
+       ) 
+    {
+        raiseError(QObject::tr("The file is not an OpenSearch 1.1 file."));
+        return engine;
+    }
+
+    while (!(isEndElement() && name() == QL1S("OpenSearchDescription")) && !atEnd()) 
+    {
+        readNext();
+
+        if (!isStartElement())
+            continue;
+
+        // ShortName
+        if (name() == QL1S("ShortName")) 
+        {
+            engine->setName(readElementText());
+            continue;
+        }
+        
+        // Description
+        if (name() == QL1S("Description")) 
+        {
+            engine->setDescription(readElementText());
+            continue;
+        }
+        
+        // Url
+        if (name() == QL1S("Url")) 
+        {
+            QString type = attributes().value(QL1S("type")).toString();
+            QString url = attributes().value(QL1S("template")).toString();
+
+            if (url.isEmpty())
+                continue;
+
+            QList<OpenSearchEngine::Parameter> parameters;
+
+            readNext();
+
+            while (!(isEndElement() && name() == QL1S("Url"))) 
+            {
+                if (!isStartElement() || (name() != QL1S("Param") && name() != QL1S("Parameter"))) {
+                    readNext();
+                    continue;
+                }
+
+                QString key = attributes().value(QL1S("name")).toString();
+                QString value = attributes().value(QL1S("value")).toString();
+
+                if (!key.isEmpty() && !value.isEmpty()) 
+                {
+                    parameters.append(OpenSearchEngine::Parameter(key, value));
+                }
+
+                while (!isEndElement()) 
+                {
+                    readNext();
+                }
+            }
+
+            if (type == QL1S("application/x-suggestions+json")) 
+            {
+                engine->setSuggestionsUrlTemplate(url);
+                engine->setSuggestionsParameters(parameters);
+            }
+            else 
+            {
+                engine->setSearchUrlTemplate(url);
+                engine->setSearchParameters(parameters);
+            }
+            
+            continue;
+        }
+        
+        // Image
+        if (name() == QL1S("Image")) 
+        {
+             engine->setImageUrl(readElementText());
+             continue;
+        }
+
+        // Engine check
+        if (    !engine->name().isEmpty()
+             && !engine->description().isEmpty()
+             && !engine->suggestionsUrlTemplate().isEmpty()
+             && !engine->searchUrlTemplate().isEmpty()
+             && !engine->imageUrl().isEmpty()
+           ) 
+        {
+            break;
+        }
+    }
+
+    return engine;
+}
diff --git a/src/search/opensearchreader.h b/src/search/opensearchreader.h
new file mode 100644
index 00000000..4e2444e0
--- /dev/null
+++ b/src/search/opensearchreader.h
@@ -0,0 +1,55 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Jakub Wieczorek <faw217@gmail.com>
+* Copyright (C) 2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef OPENSEARCHREADER_H
+#define OPENSEARCHREADER_H
+
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// Qt Includes
+#include <QtCore/QXmlStreamReader>
+
+// Forward Declarations
+class OpenSearchEngine;
+
+
+class OpenSearchReader : public QXmlStreamReader
+{
+public:
+    OpenSearchReader();
+
+    OpenSearchEngine *read(const QByteArray &data);
+    OpenSearchEngine *read(QIODevice *device);
+
+private:
+    OpenSearchEngine *read();
+};
+
+#endif // OPENSEARCHREADER_H
diff --git a/src/search/opensearchwriter.cpp b/src/search/opensearchwriter.cpp
new file mode 100644
index 00000000..81ce022c
--- /dev/null
+++ b/src/search/opensearchwriter.cpp
@@ -0,0 +1,134 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Jakub Wieczorek <faw217@gmail.com>
+* Copyright (C) 2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "opensearchwriter.h"
+
+// Local Includes
+#include "opensearchengine.h"
+
+// KDE Includes
+#include <KDebug>
+
+// Qt Includes
+#include <QtCore/QIODevice>
+
+
+
+OpenSearchWriter::OpenSearchWriter()
+    : QXmlStreamWriter()
+{
+    setAutoFormatting(true);
+}
+
+
+bool OpenSearchWriter::write(QIODevice *device, OpenSearchEngine *engine)
+{
+    if (!engine)
+        return false;
+
+    if (!device->isOpen())
+        device->open(QIODevice::WriteOnly);
+
+    setDevice(device);
+    write(engine);
+    return true;
+}
+
+
+void OpenSearchWriter::write(OpenSearchEngine *engine)
+{
+    writeStartDocument();
+    writeStartElement(QL1S("OpenSearchDescription"));
+    writeDefaultNamespace(QL1S("http://a9.com/-/spec/opensearch/1.1/"));
+
+    if (!engine->name().isEmpty()) 
+    {
+        writeTextElement(QL1S("ShortName"), engine->name());
+    }
+
+    if (!engine->description().isEmpty()) 
+    {
+        writeTextElement(QL1S("Description"), engine->description());
+    }
+
+    if (!engine->searchUrlTemplate().isEmpty()) 
+    {
+        writeStartElement(QL1S("Url"));
+        writeAttribute(QL1S("method"), QL1S("get"));
+        writeAttribute(QL1S("template"), engine->searchUrlTemplate());
+
+        if (!engine->searchParameters().empty()) 
+        {
+            writeNamespace(QL1S("http://a9.com/-/spec/opensearch/extensions/parameters/1.0/"), QL1S("p"));
+
+            QList<OpenSearchEngine::Parameter>::const_iterator end = engine->searchParameters().constEnd();
+            QList<OpenSearchEngine::Parameter>::const_iterator i = engine->searchParameters().constBegin();
+            for (; i != end; ++i) 
+            {
+                writeStartElement(QL1S("p:Parameter"));
+                writeAttribute(QL1S("name"), i->first);
+                writeAttribute(QL1S("value"), i->second);
+                writeEndElement();
+            }
+        }
+
+        writeEndElement();
+    }
+
+    if (!engine->suggestionsUrlTemplate().isEmpty()) 
+    {
+        writeStartElement(QL1S("Url"));
+        writeAttribute(QL1S("method"), QL1S("get"));
+        writeAttribute(QL1S("type"), QL1S("application/x-suggestions+json"));
+        writeAttribute(QL1S("template"), engine->suggestionsUrlTemplate());
+
+        if (!engine->suggestionsParameters().empty()) 
+        {
+            writeNamespace(QL1S("http://a9.com/-/spec/opensearch/extensions/parameters/1.0/"), QL1S("p"));
+
+            QList<OpenSearchEngine::Parameter>::const_iterator end = engine->suggestionsParameters().constEnd();
+            QList<OpenSearchEngine::Parameter>::const_iterator i = engine->suggestionsParameters().constBegin();
+            for (; i != end; ++i) 
+            {
+                writeStartElement(QL1S("p:Parameter"));
+                writeAttribute(QL1S("name"), i->first);
+                writeAttribute(QL1S("value"), i->second);
+                writeEndElement();
+            }
+        }
+
+        writeEndElement();
+    }
+
+    if (!engine->imageUrl().isEmpty())
+        writeTextElement(QL1S("Image"), engine->imageUrl());
+
+    writeEndElement();
+    writeEndDocument();
+}
diff --git a/src/search/opensearchwriter.h b/src/search/opensearchwriter.h
new file mode 100644
index 00000000..6a2e0d11
--- /dev/null
+++ b/src/search/opensearchwriter.h
@@ -0,0 +1,56 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Jakub Wieczorek <faw217@gmail.com>
+* Copyright (C) 2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef OPENSEARCHWRITER_H
+#define OPENSEARCHWRITER_H
+
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// Qt Includes
+#include <QtCore/QXmlStreamWriter>
+
+// Forward Declarations
+class QIODevice;
+class OpenSearchEngine;
+
+
+class OpenSearchWriter : public QXmlStreamWriter
+{
+public:
+    OpenSearchWriter();
+
+    bool write(QIODevice *device, OpenSearchEngine *engine);
+
+private:
+    void write(OpenSearchEngine *engine);
+};
+
+#endif
+
diff --git a/src/searchengine.cpp b/src/search/searchengine.cpp
index 7065d55f..7065d55f 100644
--- a/src/searchengine.cpp
+++ b/src/search/searchengine.cpp
diff --git a/src/searchengine.h b/src/search/searchengine.h
index e57b1a5c..e57b1a5c 100644
--- a/src/searchengine.h
+++ b/src/search/searchengine.h
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index b77e2d7c..a9203bf7 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -153,13 +153,10 @@ void CompletionWidget::activateCurrentListItem()
 
     //update text of the url bar
     bar->blockSignals(true); //without compute suggestions
-    if (!widget->inherits("SearchListItem"))
-        bar->setQUrl( widget->url() );
-    else
-        bar->setQUrl( _typedString );
+    bar->setQUrl(widget->text());
     bar->blockSignals(false);
     bar->setFocus();
-    bar->setCursorPosition( bar->text().length() );
+    bar->setCursorPosition(bar->text().length());
 }
 
 
@@ -240,7 +237,7 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev)
                 if( _currentIndex == -1)
                     _currentIndex = 0;
                 child = findChild<ListItem *>(QString::number(_currentIndex));
-                if(child && _typedString == w->text())
+                if(child)
                 {
                     emit chosenUrl(child->url(), Rekonq::CurrentTab);
                 }
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index f10cefd7..e9bb6fbb 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -139,6 +139,12 @@ KUrl ListItem::url()
 }
 
 
+QString ListItem::text()
+{
+    return m_url.url();
+}
+
+
 void ListItem::nextItemSubChoice()
 {
     //will be override
@@ -161,6 +167,7 @@ TypeIconLabel::TypeIconLabel(int type, QWidget *parent)
     if (type & UrlSearchItem::Browse) hLayout->addWidget(getIcon("applications-internet"));
     if (type & UrlSearchItem::Bookmark) hLayout->addWidget(getIcon("rating"));
     if (type & UrlSearchItem::History) hLayout->addWidget(getIcon("view-history"));
+    if (type & UrlSearchItem::Suggestion) hLayout->addWidget(getIcon("help-hint"));
 }
 
 
@@ -297,6 +304,12 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q
 }
 
 
+QString SearchListItem::text()
+{
+    return m_text;
+}
+
+
 QString SearchListItem::searchItemTitle(QString engine, QString text)
 {
     return QString(i18nc("%1=search engine, e.g. Google, Wikipedia %2=text to search for", "Search %1 for <b>%2</b>", engine, Qt::escape(text)));
@@ -390,6 +403,42 @@ void EngineBar::selectNextEngine()
 // ---------------------------------------------------------------
 
 
+SuggestionListItem::SuggestionListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
+        : ListItem(item, parent)
+        , m_text(item.title)
+{
+    QHBoxLayout *hLayout = new QHBoxLayout;
+    hLayout->setSpacing(4);
+
+    QString query = item.title;
+    KService::Ptr engine = SearchEngine::fromString(query);
+    if (engine)
+    {
+        query = query.remove(0, text.indexOf(SearchEngine::delimiter()) + 1);
+    }
+    else
+    {
+        engine = qobject_cast<CompletionWidget *>(parent)->searchEngine();
+    }
+
+    m_url = SearchEngine::buildQuery(engine, query);
+
+    hLayout->addWidget(new IconLabel(SearchEngine::buildQuery(engine, ""), this));
+    hLayout->addWidget(new TextLabel(item.title, text, this));
+    hLayout->addWidget(new TypeIconLabel(item.type, this));
+
+    setLayout(hLayout);
+}
+
+
+QString SuggestionListItem::text()
+{
+    return m_text;
+}
+
+// ---------------------------------------------------------------
+
+
 BrowseListItem::BrowseListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
         : ListItem(item, parent)
 {
@@ -427,7 +476,15 @@ ListItem *ListItemFactory::create(const UrlSearchItem &item, const QString &text
         }
         else
         {
-            newItem = new PreviewListItem(item, text, parent);
+
+            if (item.type & UrlSearchItem::Suggestion)
+            {
+                newItem = new SuggestionListItem(item, text, parent);
+            }
+            else
+            {
+                newItem = new PreviewListItem(item, text, parent);
+            }
         }
     }
 
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index dcb4f76d..06a02b80 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -61,7 +61,8 @@ public:
     void deactivate();
 
     KUrl url();
-
+    virtual QString text();
+    
 public slots:
     virtual void nextItemSubChoice();
 
@@ -153,6 +154,7 @@ class SearchListItem : public ListItem
 
 public:
     explicit SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+    QString text();
 
 public slots:
     virtual void nextItemSubChoice();
@@ -174,6 +176,22 @@ private:
 // -------------------------------------------------------------------------
 
 
+class SuggestionListItem : public ListItem
+{
+    Q_OBJECT
+
+public:
+    SuggestionListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+    QString text();
+
+private:
+    QString m_text;
+};
+
+
+// -------------------------------------------------------------------------
+
+
 class PreviewListItem : public ListItem
 {
     Q_OBJECT
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index ed4dcb4e..0505dad1 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -45,7 +45,7 @@
 
 // defines
 #define MAX_ELEMENTS 10
-
+#define MIN_SUGGESTIONS 3
 
 // NOTE 
 // default kurifilter plugin list (at least in my box):
@@ -63,7 +63,8 @@ QRegExp UrlResolver::_browseRegexp;
 QRegExp UrlResolver::_searchEnginesRegexp;
 
 UrlResolver::UrlResolver(const QString &typedUrl)
-        : _typedString(typedUrl.trimmed())
+        : QObject()
+        , _typedString(typedUrl.trimmed())
 {
     if ( _browseRegexp.isEmpty() )
     {
@@ -110,20 +111,9 @@ UrlResolver::UrlResolver(const QString &typedUrl)
 
 UrlSearchList UrlResolver::orderedSearchItems()
 {
-    // NOTE 
-    // the logic here is : "we wanna suggest (at least) 10 elements"
-    // so we have (more or less) 2 from first results (1 from QUrl Resolutions, 1 from
-    // search engines).
-    // There are 8 remaining: if bookmarkResults + historyResults <= 8, catch all, else
-    // catch first 4 results from the two resulting lists :)
-
-    QTime myTime;
-    myTime.start();
-    
-    UrlSearchList list;
-
     if( _typedString == QL1S("about:") )
     {
+        UrlSearchList list;
         UrlSearchItem home(UrlSearchItem::Browse, QString("about:home"),       QL1S("home") );
         list << home;
         UrlSearchItem favs(UrlSearchItem::Browse, QString("about:favorites"),  QL1S("favorites") );
@@ -136,148 +126,189 @@ UrlSearchList UrlResolver::orderedSearchItems()
         list << hist;
         UrlSearchItem down(UrlSearchItem::Browse, QString("about:downloads"),  QL1S("downloads") );
         list << down;
-
+        
         return list;
     }
     
+    _computedListsCount = 0;
+
+    //compute lists
+    computeSuggestions();
+    computeQurlFromUserInput();
+    computeWebSearches();
+    computeBookmarks();
+    computeHistory();
+
+    QTime time;
+    time.start();
+
+    while (_computedListsCount < 5 && time.msec() < 1000)
+    {
+        Application::instance()->processEvents(QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents); 
+    }
+
+    return orderLists();
+}
+
+
+UrlSearchList UrlResolver::orderLists()
+{
+    // NOTE 
+    // the logic here is : "we wanna suggest (at least) 10 elements"
+    // so we have (more or less) 2 from first results (1 from QUrl Resolutions, 1 from
+    // search engines).
+    // There are 8 remaining: if bookmarkResults + historyResults <= 8, catch all, else
+    // catch first 4 results from the two resulting lists :)
+
+    QTime myTime;
+    myTime.start();
+    
+    UrlSearchList list;
+    
     if(_browseRegexp.indexIn(_typedString) != -1)
     {
-        list << qurlFromUserInputResolution();
-        list << webSearchesResolution();
+        list << _qurlFromUserInput;
+        list << _webSearches;
     }
     else
     {
-        list << webSearchesResolution();
-        list << qurlFromUserInputResolution();
+        list << _webSearches;
+        list << _qurlFromUserInput;
     }
 
     //find the history items that match the typed string
-    UrlSearchList historyList = historyResolution();
-    UrlSearchItem privileged = privilegedItem(&historyList);
-    int historyResults = historyList.count();
+    UrlSearchItem privileged = privilegedItem(&_history);
+    int historyCount = _history.count();
     
     //find the bookmarks items that match the typed string
-    UrlSearchList bookmarksList = bookmarksResolution();
     if (privileged.type == UrlSearchItem::Undefined)
     {
-        privileged = privilegedItem(&bookmarksList);
+        privileged = privilegedItem(&_bookmarks);
     }
-    else if(privileged.type == UrlSearchItem::History && bookmarksList.removeOne(privileged))
+    else if(privileged.type == UrlSearchItem::History && _bookmarks.removeOne(privileged))
     {
         privileged.type |= UrlSearchItem::Bookmark;
     }
-    int bookmarksResults = bookmarksList.count();
+    int bookmarksCount = _bookmarks.count();
     
     if (privileged.type != UrlSearchItem::Undefined)
     {
         list.prepend(privileged);
     }
+
+    int availableEntries = MAX_ELEMENTS - list.count() - MIN_SUGGESTIONS;
     
-    int availableEntries = MAX_ELEMENTS - list.count();
-    
-    UrlSearchList commonList;
-    int commonResutls = 0;
+    UrlSearchList common;
+    int commonCount = 0;
 
     //prefer items which are history items als well bookmarks item
     //if there are more than 1000 bookmark results, the performance impact is noticeable
-    if(bookmarksResults < 1000)
+    if(bookmarksCount < 1000)
     {
         //add as many items to the common list as there are available entries in the dropdown list
         UrlSearchItem urlSearchItem;
-        for(int i = 0; i < historyList.count(); i++)
+        for(int i = 0; i < _history.count(); i++)
         {
-            if (bookmarksList.removeOne(historyList.at(i)))
+            if (_bookmarks.removeOne(_history.at(i)))
             {
-                urlSearchItem = historyList.takeAt(i);
+                urlSearchItem = _history.takeAt(i);
                 urlSearchItem.type |= UrlSearchItem::Bookmark;
-                commonList << urlSearchItem;
-                commonResutls++;
-                if(commonResutls >= availableEntries)
+                common << urlSearchItem;
+                commonCount++;
+                if(commonCount >= availableEntries)
                 {
                     break;
                 }
             }
         }
         
-        commonResutls = commonList.count();
-        if(commonResutls >= availableEntries)
+        commonCount = common.count();
+        if(commonCount >= availableEntries)
         {
-            commonList = commonList.mid(0, availableEntries);
-            historyList = UrlSearchList();
-            bookmarksList = UrlSearchList();
+            common = common.mid(0, availableEntries);
+            _history = UrlSearchList();
+            _bookmarks = UrlSearchList();
             availableEntries = 0;
         }
         else        //remove all items from the history and bookmarks list up to the remaining entries in the dropdown list
         {
-            availableEntries -= commonResutls;
-            if(historyResults >= availableEntries)
+            availableEntries -= commonCount;
+            if(historyCount >= availableEntries)
             {
-                historyList = historyList.mid(0, availableEntries);
+                _history = _history.mid(0, availableEntries);
             }
-            if(bookmarksResults >= availableEntries)
+            if(bookmarksCount >= availableEntries)
             {
-                bookmarksList = bookmarksList.mid(0, availableEntries);
+                _bookmarks = _bookmarks.mid(0, availableEntries);
             }
         }
     }
     else        //if there are too many bookmarks items, remove all items up to the remaining entries in the dropdown list
     {
-        
-        if(historyResults >= availableEntries)
+
+        if(historyCount >= availableEntries)
         {
-            historyList = historyList.mid(0, availableEntries);
+            _history = _history.mid(0, availableEntries);
         }
-        if(bookmarksResults >= availableEntries)
+        if(bookmarksCount >= availableEntries)
         {
-            bookmarksList = bookmarksList.mid(0, availableEntries);
+            _bookmarks = _bookmarks.mid(0, availableEntries);
         }
 
         UrlSearchItem urlSearchItem;
-        for(int i = 0; i < historyList.count(); i++)
+        for(int i = 0; i < _history.count(); i++)
         {
-            if (bookmarksList.removeOne(historyList.at(i)))
+            if (_bookmarks.removeOne(_history.at(i)))
             {
-                urlSearchItem = historyList.takeAt(i);
+                urlSearchItem = _history.takeAt(i);
                 urlSearchItem.type |= UrlSearchItem::Bookmark;
-                commonList << urlSearchItem;
+                common << urlSearchItem;
             }
         }
         
-        availableEntries -= commonList.count();
+        availableEntries -= common.count();
     }
     
-    historyResults = historyList.count();
-    bookmarksResults = bookmarksList.count();
-    commonResutls = commonList.count();
-    
+    historyCount = _history.count();
+    bookmarksCount = _bookmarks.count();
+    commonCount = common.count();
+
     //now fill the list to MAX_ELEMENTS
     if(availableEntries > 0)
     {
         int historyEntries = ((int) (availableEntries / 2)) + availableEntries % 2;
         int bookmarksEntries = availableEntries - historyEntries;
         
-        if (historyResults >= historyEntries && bookmarksResults >= bookmarksEntries)
+        if (historyCount >= historyEntries && bookmarksCount >= bookmarksEntries)
         {
-            historyList = historyList.mid(0, historyEntries);
-            bookmarksList = bookmarksList.mid(0, bookmarksEntries);
+            _history = _history.mid(0, historyEntries);
+            _bookmarks = _bookmarks.mid(0, bookmarksEntries);
         }
-        else if (historyResults < historyEntries && bookmarksResults >= bookmarksEntries)
+        else if (historyCount < historyEntries && bookmarksCount >= bookmarksEntries)
         {
-            if(historyResults + bookmarksResults > availableEntries)
+            if(historyCount + bookmarksCount > availableEntries)
             {
-                bookmarksList = bookmarksList.mid(0, availableEntries - historyResults);
+                _bookmarks = _bookmarks.mid(0, availableEntries - historyCount);
             }
         }
-        else if (historyResults >= historyEntries && bookmarksResults < bookmarksEntries)
+        else if (historyCount >= historyEntries && bookmarksCount < bookmarksEntries)
         {
-            if(historyResults + bookmarksResults > availableEntries)
+            if(historyCount + bookmarksCount > availableEntries)
             {
-                historyList = historyList.mid(0, availableEntries - bookmarksResults);
+                _history = _history.mid(0, availableEntries - bookmarksCount);
             }
         }
     }
-    
-    list = list + historyList + commonList + bookmarksList;
+
+    availableEntries -=  _history.count();
+    availableEntries -=  _bookmarks.count();
+
+    if (_suggestions.count() > availableEntries + MIN_SUGGESTIONS)
+    {
+        _suggestions = _suggestions.mid(0, availableEntries + MIN_SUGGESTIONS);
+    }
+
+    list = list + _history + common + _bookmarks + _suggestions;
     qWarning() << "orderedSearchItems leave: " << " elapsed: " << myTime.elapsed();
     
     return list;
@@ -288,60 +319,93 @@ UrlSearchList UrlResolver::orderedSearchItems()
 // PRIVATE ENGINES
 
 
-// STEP 1 = QUrl from User Input (easily the best solution... )
-UrlSearchList UrlResolver::qurlFromUserInputResolution()
+//QUrl from User Input (easily the best solution... )
+void UrlResolver::computeQurlFromUserInput()
 {
-    UrlSearchList list;
-    QString url2 = _typedString;
-    QUrl urlFromUserInput = QUrl::fromUserInput(url2);
+    QString url = _typedString;
+    QUrl urlFromUserInput = QUrl::fromUserInput(url);
     if (urlFromUserInput.isValid())
     {
         QString gTitle = i18nc("Browse a website", "Browse");
         UrlSearchItem gItem(UrlSearchItem::Browse, urlFromUserInput.toString(), gTitle);
-        list << gItem;
+        _qurlFromUserInput << gItem;
     }
 
-    return list;
+    _computedListsCount++;
 }
 
 
-// STEP 2 = Web Searches
-UrlSearchList UrlResolver::webSearchesResolution()
+//webSearches
+void UrlResolver::computeWebSearches()
 {
-    return UrlSearchList() << UrlSearchItem(UrlSearchItem::Search, QString(), QString());
+    _webSearches = (UrlSearchList() << UrlSearchItem(UrlSearchItem::Search, QString(), QString()));
+    _computedListsCount++;
 }
 
 
-// STEP 3 = history completion
-UrlSearchList UrlResolver::historyResolution()
+//history
+void UrlResolver::computeHistory()
 {
     QList<HistoryItem> found = Application::historyManager()->find(_typedString);
     qSort(found);
 
-    UrlSearchList list;
     Q_FOREACH(const HistoryItem &i, found)
     {
         if (_searchEnginesRegexp.indexIn(i.url) == -1) //filter all urls that are search engine results
         {
             UrlSearchItem gItem(UrlSearchItem::History, i.url, i.title);
-            list << gItem;
+            _history << gItem;
         }
     }
-    return list;
+
+    _computedListsCount++;
 }
 
 
-// STEP 4 = bookmarks completion
-UrlSearchList UrlResolver::bookmarksResolution()
+// bookmarks
+void UrlResolver::computeBookmarks()
 {
-    UrlSearchList list;
     QList<KBookmark> found = Application::bookmarkProvider()->find(_typedString);
+
     Q_FOREACH(const KBookmark &b, found)
     {
         UrlSearchItem gItem(UrlSearchItem::Bookmark, b.url().url(), b.fullText());
-        list << gItem;
+        _bookmarks << gItem;
     }
-    return list;
+
+    _computedListsCount++;
+}
+
+
+//opensearch suggestion
+void UrlResolver::computeSuggestions()
+{
+    if (Application::opensearchManager()->isSuggestionAvailable())
+    {
+        connect(Application::opensearchManager(), 
+                SIGNAL(suggestionReceived(const QStringList &)), 
+                this, 
+                SLOT(suggestionsReceived(const QStringList &)));
+
+        Application::opensearchManager()->requestSuggestion(_typedString);
+    }
+    else
+    {
+        _computedListsCount++;
+    }
+}
+
+
+void UrlResolver::suggestionsReceived(const QStringList &suggestion)
+{
+   
+    foreach (QString s, suggestion)
+    {
+        UrlSearchItem gItem(UrlSearchItem::Suggestion, s, s);
+        _suggestions << gItem;
+    }
+
+    _computedListsCount++;
 }
 
 
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index c79ce184..f72d6731 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -38,6 +38,7 @@
 // Qt Includes
 #include <QString>
 #include <QList>
+#include <QStringList>
 
 class UrlSearchItem
 {
@@ -50,6 +51,7 @@ public:
         Browse          = 0x00000010,
         History         = 0x00000100,
         Bookmark        = 0x00001000,
+        Suggestion      = 0x00010000,
     };
 
     int type;
@@ -93,8 +95,10 @@ typedef QList <UrlSearchItem> UrlSearchList;
 // ----------------------------------------------------------------------
 
 
-class UrlResolver
+class UrlResolver : public QObject
 {
+    Q_OBJECT
+
 public:
     UrlResolver(const QString &typedUrl);
 
@@ -103,14 +107,29 @@ public:
 private:
     QString _typedString;
 
-    UrlSearchList webSearchesResolution();
-    UrlSearchList historyResolution();
-    UrlSearchList qurlFromUserInputResolution();
-    UrlSearchList bookmarksResolution();
+    UrlSearchList _webSearches;
+    UrlSearchList _qurlFromUserInput;
+    UrlSearchList _history;
+    UrlSearchList _bookmarks;
+    UrlSearchList _suggestions;
+    
+    void computeWebSearches();
+    void computeHistory();
+    void computeQurlFromUserInput();
+    void computeBookmarks();
+    void computeSuggestions();
+
+    int _computedListsCount;
+
     UrlSearchItem privilegedItem(UrlSearchList* list);
-     
+    UrlSearchList orderLists();
+
     static QRegExp _browseRegexp;
     static QRegExp _searchEnginesRegexp;
+    
+private slots:
+    void suggestionsReceived(const QStringList &suggestion);    
+    
 };
 
 // ------------------------------------------------------------------------------