1 files changed, 22 insertions, 24 deletions

diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 098ba027..9be6bca0 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -23,31 +23,19 @@
 
 #include "browserapplication.h"
 
-// Qt Includes
-#include <QtGui>
 
-
-UrlBar::UrlBar(QWidget *parent)
-    : QWidget(parent)
+UrlBar::UrlBar(KHistoryComboBox *parent)
+    : KHistoryComboBox(true, parent)
     , m_webView(0)
-    , m_iconLabel(0)
     , m_lineEdit(0)
 {
-    // icon
-    m_iconLabel = new QLabel;
-    m_iconLabel->resize(16, 16);
-
-    m_lineEdit = new KLineEdit;
-
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->addWidget(m_iconLabel);
-    layout->addWidget(m_lineEdit);
-    setLayout(layout);
-
-    m_defaultBaseColor = palette().color(QPalette::Base);
-//     setPalette( QPalette(Qt::white) );
-    setAutoFillBackground( false );
-
+    m_lineEdit = new QLineEdit;
+    setLineEdit( m_lineEdit );
+    
+    // add every item to history
+    connect( this, SIGNAL( activated( const QString& )), this, SLOT( addToHistory( const QString& )));
+    
+    connect( this, SIGNAL( activated(int) ), this, SLOT( prova() ) );
     webViewIconChanged();
 }
 
@@ -57,7 +45,7 @@ UrlBar::~UrlBar()
 }
 
 
-KLineEdit *UrlBar::lineEdit()
+QLineEdit *UrlBar::lineEdit()
 {
     return m_lineEdit;
 }
@@ -67,7 +55,6 @@ void UrlBar::setWebView(WebView *webView)
 {
     Q_ASSERT(!m_webView);
     m_webView = webView;
-//     m_iconLabel->m_webView = webView;
     connect(webView, SIGNAL(urlChanged(const QUrl &)), this, SLOT(webViewUrlChanged(const QUrl &)));
     connect(webView, SIGNAL(loadFinished(bool)), this, SLOT(webViewIconChanged()));
     connect(webView, SIGNAL(iconChanged()), this, SLOT(webViewIconChanged()));
@@ -87,7 +74,11 @@ void UrlBar::webViewIconChanged()
     KUrl url = (m_webView)  ? m_webView->url() : KUrl();
     QIcon icon = BrowserApplication::instance()->icon(url);
     QPixmap pixmap(icon.pixmap(16, 16));
-    m_iconLabel->setPixmap(pixmap);
+    QIcon urlIcon = QIcon(pixmap);
+    
+    // FIXME simple hack to show Icon in the urlbar, as calling changeUrl() doesn't affect it
+    removeItem( 0 );
+    insertUrl( 0 , urlIcon , url );
 }
 
 
@@ -101,3 +92,10 @@ QLinearGradient UrlBar::generateGradient(const QColor &color) const
     gradient.setColorAt(1, m_defaultBaseColor);
     return gradient;
 }
+
+
+void UrlBar::prova()
+{
+    m_lineEdit->selectAll();
+}
+