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

2 files changed, 28 insertions, 2 deletions

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index cfe26a55..c97b46af 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -161,7 +161,12 @@ BookmarkProvider::BookmarkProvider(QObject *parent)
         , m_actionCollection(new KActionCollection(this))
         , m_bookmarkMenu(0)
         , m_bookmarkToolBar(0)
+        , m_completion(0)
 {
+    // take care of the completion object
+    m_completion = new KCompletion;
+    m_completion->setOrder( KCompletion::Weighted );
+
     KUrl bookfile = KUrl("~/.kde/share/apps/konqueror/bookmarks.xml");  // share konqueror bookmarks
 
     if (!QFile::exists(bookfile.path()))
@@ -220,6 +225,7 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString
         return;
 
     m_bookmarkToolBar->clear(); // FIXME CRASH
+    m_completion->clear();
 
     KBookmark bookmark = toolBarGroup.first();
     while (!bookmark.isNull())
@@ -285,7 +291,8 @@ KAction *BookmarkProvider::fillBookmarkBar(const KBookmark &bookmark)
         return a;
     }
     else
-    {
+    {        
+        m_completion->addItem(bookmark.url().path());
         return new KBookmarkAction(bookmark, m_owner, this);
     }
 }
@@ -295,3 +302,14 @@ KBookmarkGroup BookmarkProvider::rootGroup()
 {
     return m_manager->root();
 }
+
+KCompletion *BookmarkProvider::completionObject() const
+{
+    return m_completion;
+}
+
+
+KBookmarkManager *BookmarkProvider::bookmarkManager()
+{ 
+    return m_manager; 
+}
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index d4afb997..d6b8f8e0 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -39,6 +39,7 @@
 
 // KDE Includes
 #include <KBookmarkOwner>
+#include <KCompletion>
 
 // Forward Declarations
 class BookmarkProvider;
@@ -210,7 +211,13 @@ public:
      */
     KBookmarkGroup rootGroup();
 
-	KBookmarkManager *bookmarkManager() { return m_manager; }
+    KBookmarkManager *bookmarkManager();
+    
+    /**
+    * @returns the KCompletion object.
+    */
+    KCompletion *completionObject() const;
+
 signals:
     /**
     * @short This signal is emitted when an url has to be loaded
@@ -245,6 +252,7 @@ private:
     KActionCollection *m_actionCollection;
     BookmarkMenu *m_bookmarkMenu;
     KToolBar *m_bookmarkToolBar;
+    KCompletion *m_completion;
 };
 
 #endif