X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d7d4fb9d26773c2d729b49d71af10e1378381ff3..b5cc2a6924cfd8f59611d3cec2edbb00a08b4ff1:/src/bookmarkselector.cpp

diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp
index 59f30e30a..73950434d 100644
--- a/src/bookmarkselector.cpp
+++ b/src/bookmarkselector.cpp
@@ -1,6 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
+ *   Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at)                  *
  *                                                                         *
  *   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  *
@@ -18,37 +17,40 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#include "bookmarkselector.h"
+
+#include "dolphinsettings.h"
+#include "urlnavigator.h"
 
 #include <assert.h>
-#include <q3popupmenu.h>
-#include <qpainter.h>
-#include <qpixmap.h>
 
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <kbookmarkmanager.h>
+#include <kmenu.h>
+#include <kdebug.h>
 
-#include "bookmarkselector.h"
-#include "dolphinsettings.h"
-#include "dolphinview.h"
-#include "dolphinmainwindow.h"
-#include "urlnavigator.h"
+#include <QPainter>
+#include <QPixmap>
 
 BookmarkSelector::BookmarkSelector(UrlNavigator* parent) :
     UrlButton(parent),
-    m_selectedIndex(0)
+    m_selectedIndex(0),
+    m_urlNavigator(parent)
 {
     setFocusPolicy(Qt::NoFocus);
 
-    m_bookmarksMenu = new Q3PopupMenu(this);
+    m_bookmarksMenu = new KMenu(this);
 
     KBookmarkGroup root = DolphinSettings::instance().bookmarkManager()->root();
     KBookmark bookmark = root.first();
     int i = 0;
     while (!bookmark.isNull()) {
-        m_bookmarksMenu->insertItem(MainBarIcon(bookmark.icon()),
-                                    bookmark.text(),
-                                    i);
+        QAction* action = new QAction(MainBarIcon(bookmark.icon()),
+                                      bookmark.text(),
+                                      this);
+        action->setData(i);
+        m_bookmarksMenu->addAction(action);
         if (i == m_selectedIndex) {
             QPixmap pixmap = SmallIcon(bookmark.icon());
             setIcon(QIcon(pixmap));
@@ -59,8 +61,8 @@ BookmarkSelector::BookmarkSelector(UrlNavigator* parent) :
         ++i;
     }
 
-    connect(m_bookmarksMenu, SIGNAL(activated(int)),
-            this, SLOT(slotBookmarkActivated(int)));
+    connect(m_bookmarksMenu, SIGNAL(triggered(QAction*)),
+            this, SLOT(activateBookmark(QAction*)));
 
     setMenu(m_bookmarksMenu);
 }
@@ -71,31 +73,12 @@ BookmarkSelector::~BookmarkSelector()
 
 void BookmarkSelector::updateSelection(const KUrl& url)
 {
-    KBookmarkGroup root = DolphinSettings::instance().bookmarkManager()->root();
-    KBookmark bookmark = root.first();
-
-    int maxLength = 0;
-    m_selectedIndex = -1;
-
-    // Search the bookmark which is equal to the Url or at least is a parent Url.
-    // If there are more than one possible parent Url candidates, choose the bookmark
-    // which covers the bigger range of the Url.
-    int i = 0;
-    while (!bookmark.isNull()) {
-        const KUrl bookmarkUrl = bookmark.url();
-        if (bookmarkUrl.isParentOf(url)) {
-            const int length = bookmarkUrl.prettyUrl().length();
-            if (length > maxLength) {
-                m_selectedIndex = i;
-                setIcon(SmallIcon(bookmark.icon()));
-                maxLength = length;
-            }
-        }
-        bookmark = root.next(bookmark);
-        ++i;
+    m_selectedIndex = baseBookmarkIndex(url);
+    if (m_selectedIndex >= 0) {
+        KBookmark bookmark = DolphinSettings::instance().bookmark(m_selectedIndex);
+        setIcon(SmallIcon(bookmark.icon()));
     }
-
-    if (m_selectedIndex < 0) {
+    else {
         // No bookmark has been found which matches to the given Url. Show
         // a generic folder icon as pixmap for indication:
         setIcon(SmallIcon("folder"));
@@ -113,7 +96,13 @@ QSize BookmarkSelector::sizeHint() const
     return QSize(height, height);
 }
 
-void BookmarkSelector::paintEvent(QPaintEvent* event)
+KBookmark BookmarkSelector::baseBookmark(const KUrl& url)
+{
+    const int index = baseBookmarkIndex(url);
+    return DolphinSettings::instance().bookmark(index);
+}
+
+void BookmarkSelector::paintEvent(QPaintEvent* /*event*/)
 {
     QPainter painter(this);
 
@@ -134,10 +123,7 @@ void BookmarkSelector::paintEvent(QPaintEvent* event)
     }
 
     // dimm the colors if the parent view does not have the focus
-    const DolphinView* parentView = urlNavigator()->dolphinView();
-    const DolphinMainWindow* dolphin = parentView->mainWindow();
-
-    const bool isActive = (dolphin->activeView() == parentView);
+    const bool isActive = m_urlNavigator->isActive();
     if (!isActive) {
         QColor dimmColor(palette().brush(QPalette::Background).color());
         foregroundColor = mixColors(foregroundColor, dimmColor);
@@ -164,14 +150,43 @@ void BookmarkSelector::paintEvent(QPaintEvent* event)
     painter.drawPixmap(x, y, pixmap);
 }
 
-void BookmarkSelector::slotBookmarkActivated(int index)
+void BookmarkSelector::activateBookmark(QAction* action)
 {
-    m_selectedIndex = index;
+    assert(action != 0);
+    m_selectedIndex = action->data().toInt();
 
-    KBookmark bookmark = selectedBookmark();
+    const KBookmark bookmark = selectedBookmark();
     setPixmap(SmallIcon(bookmark.icon()));
+    emit bookmarkActivated(bookmark.url());
+}
+
+int BookmarkSelector::baseBookmarkIndex(const KUrl& url)
+{
+    int index = -1;  // return value
+
+    KBookmarkGroup root = DolphinSettings::instance().bookmarkManager()->root();
+    KBookmark bookmark = root.first();
+
+    int maxLength = 0;
+
+    // Search the bookmark which is equal to the Url or at least is a parent Url.
+    // If there are more than one possible parent Url candidates, choose the bookmark
+    // which covers the bigger range of the Url.
+    int i = 0;
+    while (!bookmark.isNull()) {
+        const KUrl bookmarkUrl = bookmark.url();
+        if (bookmarkUrl.isParentOf(url)) {
+            const int length = bookmarkUrl.prettyUrl().length();
+            if (length > maxLength) {
+                index = i;
+                maxLength = length;
+            }
+        }
+        bookmark = root.next(bookmark);
+        ++i;
+    }
 
-    emit bookmarkActivated(index);
+    return index;
 }
 
 #include "bookmarkselector.moc"