diff -r bf4420e9fa4d -r 2e16851ffecd ginebra2/UrlSearchSnippet.h
--- a/ginebra2/UrlSearchSnippet.h	Fri Jun 11 16:23:26 2010 +0100
+++ b/ginebra2/UrlSearchSnippet.h	Thu Jul 22 16:30:16 2010 +0100
@@ -1,107 +1,111 @@
 /*
 * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
 *
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* 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 Lesser General Public License for more details.
 *
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description: 
+* Description:
 *
 */
 
-
 #ifndef __URLSEARCH_SNIPPET_H
 #define __URLSEARCH_SNIPPET_H
 
+#include "EditorWidget.h"
 #include "NativeChromeItem.h"
 
 namespace GVA {
 
 class ChromeWidget;
-
-class UrlEditorWidget : public QGraphicsTextItem
-{
-    Q_OBJECT
-
-public:
-    UrlEditorWidget(QGraphicsItem * parent);
-    virtual ~UrlEditorWidget();
-
-    void setText(const QString & text);
-
-    qreal cursorX();
-
-protected:
-    virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget);
-    virtual void keyPressEvent(QKeyEvent * event);
-
-signals:
-    void cursorXChanged(qreal newx);
-
-private:
-    QTextLine m_textLine;
-};
-
-class UrlSearchSnippet : public NativeChromeItem
+class GUrlSearchItem : public NativeChromeItem
 {
     Q_OBJECT
 
 public:
-    UrlSearchSnippet(ChromeSnippet * snippet, ChromeWidget * chrome, QGraphicsItem * parent = 0);
-    virtual ~UrlSearchSnippet();
+    GUrlSearchItem(ChromeSnippet * snippet, ChromeWidget * chrome, QGraphicsItem * parent = 0);
+    virtual ~GUrlSearchItem();
+    QString url() const { return m_urlSearchEditor->text();}
+    void setUrl(const QString &url) {m_urlSearchEditor->setText(url);}
 
 protected:
-    virtual bool eventFilter(QObject * object, QEvent * event);
     virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget);
     virtual void resizeEvent(QGraphicsSceneResizeEvent * event);
 
-signals:
-    void activated();
+private:
+    void loadToMainWindow();
+    void updateUrlSearchBtn();
+    QString formattedUrl() const; 
 
 private slots:
-    void resize();
-    void setUrlText(const QString & text);
+    void onChromeComplete();
     void setStarted();
     void setProgress(int percent);
     void setFinished(bool ok);
+    void setPageCreated();
+    void setPageChanged();
     void clearProgress();
     void viewChanged();
-    void makeVisible(qreal cursorX);
-
-private:
-    void internalScroll(qreal deltaX);
+    void urlSearchActivatedByEnterKey();
+    void urlSearchActivated();
+    void updateLoadState();
+    void focusChanged(bool focusIn);
+    void resize();
+    void updateLoadStateAndSuggest();
+    void onNewWindowTransitionComplete();
+    void tapped(QPointF&);
 
 private:
     ChromeWidget * m_chrome;
-    QString m_text;
-    int m_percent;
-    int m_pendingClearCalls;
 
-    // Style parameters.
-
-    QColor m_textColor;
-    QColor m_backgroundColor;
+    // configurable attributes
+    qreal m_border;
+    qreal m_padding;
+    qreal m_viewPortWidth;
+    qreal m_viewPortHeight;
     QColor m_borderColor;
 
-    int m_border;
-    int m_padding;
+    // ui components
+    QGraphicsWidget * m_viewPort;
+    ActionButton * m_urlSearchBtn;
+    GProgressEditor * m_urlSearchEditor;
 
-    // Cached values used for painting and scrolling.
+    // variables
+    int m_pendingClearCalls;
+    qreal m_iconWidth;
+    qreal m_iconHeight;
+    bool m_backFromNewWinTrans;
+    bool m_justFocusIn;
+};
 
-    qreal m_viewPortWidth;
-    qreal m_viewPortHeight;
+class GUrlSearchSnippet : public ChromeSnippet {
+  Q_OBJECT
+public:
+  GUrlSearchSnippet(const QString & elementId, ChromeWidget * chrome,
+              QGraphicsWidget * widget, const QWebElement & element);
+  
+  static GUrlSearchSnippet * instance(const QString& elementId, ChromeWidget * chrome, const QWebElement & element);
 
-    // At runtime, UrlSearchSnippet is parent to a QGraphicsWidget
-    // (m_viewPort) that is parent to a UrlEditorWidget (m_editor).
+  /// The URL of the web page.
+  QString url() const;
+  void setUrl(const QString &url);
+  Q_PROPERTY(QString url READ url WRITE setUrl)
 
-    QGraphicsWidget * m_viewPort;
-    UrlEditorWidget * m_editor;
+//public slots:
+
+private:
+  GUrlSearchItem *urlSearchItem();
+  GUrlSearchItem const *constUrlSearchItem() const;
 };
 
 } // namespace GVA