derivation of the lastbar branch: UltimateLastBar :)

what work ?
better themes for list items
hide list correctly

what doesn't work
focus of the qcombobox is lost when a key is pressed
move in the list

1 files changed, 12 insertions, 14 deletions

diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 39911bb2..18878e5f 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -2,10 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -32,23 +32,23 @@
 
 
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "lineedit.h"
+#include "completionwidget.h"
 
 // KDE Includes
 #include <KUrl>
-#include <KHistoryComboBox>
+#include <KComboBox>
 
 // Qt Includes
 #include <QUrl>
+#include <QPointer>
 
 // Forward Declarations
 class QLinearGradient;
 class QWidget;
-class KCompletion;
 
 
-class REKONQ_TESTS_EXPORT UrlBar : public KHistoryComboBox
+class UrlBar : public KComboBox
 {
     Q_OBJECT
 
@@ -64,9 +64,6 @@ public:
     
     void setProgress(int progress);
 
-signals:
-    void activated(const KUrl&);
-
 public slots:
     void setUrl(const QUrl &url);
     void updateProgress(int progress);
@@ -75,17 +72,15 @@ public slots:
 private slots:
     void activated(const QString& url);
     void loadFinished(bool);
-    void cleared();
+    void suggestUrls(const QString &editedText);
 
 protected:
     virtual void paintEvent(QPaintEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
+    virtual void focusInEvent(QFocusEvent *event);
+    virtual void changeEvent (QEvent* event);
 
 private:
-    void setupLineEdit();
-
-    KLineEdit *lineEdit() const;
-
     static QLinearGradient generateGradient(const QColor &color, int height);
 
     static QColor s_defaultBaseColor;
@@ -94,6 +89,9 @@ private:
 
     KUrl m_currentUrl;
     int m_progress;
+
+    CompletionWidget *m_box;
+    KUrl m_suggestedUrl;
 };
 
 #endif