Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / bookmarkselector.cpp

diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp
index 49267f8738357ff70ff3ea45409260128c1141fa..aefb30d749ed4c7345f4b9ad605a175f73937441 100644 (file)
--- 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  *
  *                                                                         *
  *   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  *


@@ -15,53 +14,57 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *

- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *

  ***************************************************************************/
 
  ***************************************************************************/
 

+#include "bookmarkselector.h"
+
+#include "dolphinsettings.h"
+#include "urlnavigator.h"

 
 #include <assert.h>
 
 #include <assert.h>

-#include <q3popupmenu.h>
-#include <qpainter.h>
-#include <qpixmap.h>

 
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <kbookmarkmanager.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 "dolphin.h"
-#include "urlnavigator.h"
+#include <QPainter>
+#include <QPixmap>

 
 

-BookmarkSelector::BookmarkSelector(URLNavigator* parent) :
-    URLButton(parent),
-    m_selectedIndex(0)
+BookmarkSelector::BookmarkSelector(UrlNavigator* parent) :
+    UrlButton(parent),
+    m_selectedIndex(0),
+    m_urlNavigator(parent)

 {
     setFocusPolicy(Qt::NoFocus);
 
 {
     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()) {
 
     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());
         if (i == m_selectedIndex) {
             QPixmap pixmap = SmallIcon(bookmark.icon());

-            setPixmap(pixmap);
+            setIcon(QIcon(pixmap));
+            setIconSize(pixmap.size());

             setMinimumWidth(pixmap.width() + 2);
         }
         bookmark = root.next(bookmark);
         ++i;
     }
 
             setMinimumWidth(pixmap.width() + 2);
         }
         bookmark = root.next(bookmark);
         ++i;
     }
 

-    connect(m_bookmarksMenu, SIGNAL(activated(int)),
-            this, SLOT(slotBookmarkActivated(int)));
+    connect(m_bookmarksMenu, SIGNAL(triggered(QAction*)),
+            this, SLOT(activateBookmark(QAction*)));

 
 

-    setPopup(m_bookmarksMenu);
+    setMenu(m_bookmarksMenu);

 }
 
 BookmarkSelector::~BookmarkSelector()
 }
 
 BookmarkSelector::~BookmarkSelector()


@@ -76,17 +79,17 @@ void BookmarkSelector::updateSelection(const KUrl& url)
     int maxLength = 0;
     m_selectedIndex = -1;
 
     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.
+    // 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()) {
     int i = 0;
     while (!bookmark.isNull()) {

-        const KUrl bookmarkURL = bookmark.url();
-        if (bookmarkURL.isParentOf(url)) {
-            const int length = bookmarkURL.prettyUrl().length();
+        const KUrl bookmarkUrl = bookmark.url();
+        if (bookmarkUrl.isParentOf(url)) {
+            const int length = bookmarkUrl.prettyUrl().length();

             if (length > maxLength) {
                 m_selectedIndex = i;
             if (length > maxLength) {
                 m_selectedIndex = i;

-                setPixmap(SmallIcon(bookmark.icon()));
+                setIcon(SmallIcon(bookmark.icon()));

                 maxLength = length;
             }
         }
                 maxLength = length;
             }
         }


@@ -95,9 +98,9 @@ void BookmarkSelector::updateSelection(const KUrl& url)
     }
 
     if (m_selectedIndex < 0) {
     }
 
     if (m_selectedIndex < 0) {

-        // No bookmark has been found which matches to the given URL. Show
+        // No bookmark has been found which matches to the given Url. Show

         // a generic folder icon as pixmap for indication:
         // a generic folder icon as pixmap for indication:

-        setPixmap(SmallIcon("folder"));
+        setIcon(SmallIcon("folder"));

     }
 }
 
     }
 }
 


@@ -106,31 +109,36 @@ KBookmark BookmarkSelector::selectedBookmark() const
     return DolphinSettings::instance().bookmark(m_selectedIndex);
 }
 
     return DolphinSettings::instance().bookmark(m_selectedIndex);
 }
 

-void BookmarkSelector::drawButton(QPainter* painter)
+QSize BookmarkSelector::sizeHint() const

 {
 {

+    const int height = UrlButton::sizeHint().height();
+    return QSize(height, height);
+}
+
+void BookmarkSelector::paintEvent(QPaintEvent* /*event*/)
+{
+    QPainter painter(this);
+

     const int buttonWidth  = width();
     const int buttonHeight = height();
 
     QColor backgroundColor;
     QColor foregroundColor;
     const bool isHighlighted = isDisplayHintEnabled(EnteredHint) ||
     const int buttonWidth  = width();
     const int buttonHeight = height();
 
     QColor backgroundColor;
     QColor foregroundColor;
     const bool isHighlighted = isDisplayHintEnabled(EnteredHint) ||

-        isDisplayHintEnabled(DraggedHint);
+                               isDisplayHintEnabled(DraggedHint);

     if (isHighlighted) {
         backgroundColor = KGlobalSettings::highlightColor();
         foregroundColor = KGlobalSettings::highlightedTextColor();
     }
     else {
     if (isHighlighted) {
         backgroundColor = KGlobalSettings::highlightColor();
         foregroundColor = KGlobalSettings::highlightedTextColor();
     }
     else {

-        backgroundColor = colorGroup().background();
+        backgroundColor = palette().brush(QPalette::Background).color();

         foregroundColor = KGlobalSettings::buttonTextColor();
     }
 
     // dimm the colors if the parent view does not have the focus
         foregroundColor = KGlobalSettings::buttonTextColor();
     }
 
     // dimm the colors if the parent view does not have the focus

-    const DolphinView* parentView = urlNavigator()->dolphinView();
-    const Dolphin& dolphin = Dolphin::mainWin();
-
-    const bool isActive = (dolphin.activeView() == parentView);
+    const bool isActive = m_urlNavigator->isActive();

     if (!isActive) {
     if (!isActive) {

-        QColor dimmColor(colorGroup().background());
+        QColor dimmColor(palette().brush(QPalette::Background).color());

         foregroundColor = mixColors(foregroundColor, dimmColor);
         if (isHighlighted) {
             backgroundColor = mixColors(backgroundColor, dimmColor);
         foregroundColor = mixColors(foregroundColor, dimmColor);
         if (isHighlighted) {
             backgroundColor = mixColors(backgroundColor, dimmColor);


@@ -140,31 +148,29 @@ void BookmarkSelector::drawButton(QPainter* painter)
     if (!(isDisplayHintEnabled(ActivatedHint) && isActive) && !isHighlighted) {
         // dimm the foreground color by mixing it with the background
         foregroundColor = mixColors(foregroundColor, backgroundColor);
     if (!(isDisplayHintEnabled(ActivatedHint) && isActive) && !isHighlighted) {
         // dimm the foreground color by mixing it with the background
         foregroundColor = mixColors(foregroundColor, backgroundColor);

-        painter->setPen(foregroundColor);
+        painter.setPen(foregroundColor);

     }
 
     // draw button backround
     }
 
     // draw button backround

-    painter->setPen(Qt::NoPen);
-    painter->setBrush(backgroundColor);
-    painter->drawRect(0, 0, buttonWidth, buttonHeight);
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(backgroundColor);
+    painter.drawRect(0, 0, buttonWidth, buttonHeight);

 
     // draw icon
 
     // draw icon

-    const QPixmap* icon = pixmap();
-    if (icon != 0) {
-        const int x = (buttonWidth - icon->width()) / 2;
-        const int y = (buttonHeight - icon->height()) / 2;
-        painter->drawPixmap(x, y, *icon);
-    }
+    const QPixmap pixmap = icon().pixmap();
+    const int x = (buttonWidth -  pixmap.width()) / 2;
+    const int y = (buttonHeight - pixmap.height()) / 2;
+    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()));
     setPixmap(SmallIcon(bookmark.icon()));

-
-    emit bookmarkActivated(index);
+    emit bookmarkActivated(bookmark.url());

 }
 
 #include "bookmarkselector.moc"
 }
 
 #include "bookmarkselector.moc"