Reanimated drag & drop support again after introducing the DolphinController. It...

[dolphin.git] / src / bookmarkselector.cpp

diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp
index 8cd2917dc149797aefc06413c91db67cb2b9c443..59f30e30a32c687d19664309dc37947d23ae8864 100644 (file)
--- a/src/bookmarkselector.cpp
+++ b/src/bookmarkselector.cpp
@@ -15,7 +15,7 @@
  *   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            *
  ***************************************************************************/
 
 
@@ -31,7 +31,7 @@
 #include "bookmarkselector.h"
 #include "dolphinsettings.h"
 #include "dolphinview.h"
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 #include "urlnavigator.h"
 
 BookmarkSelector::BookmarkSelector(UrlNavigator* parent) :
@@ -51,7 +51,8 @@ BookmarkSelector::BookmarkSelector(UrlNavigator* parent) :
                                     i);
         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);
@@ -61,7 +62,7 @@ BookmarkSelector::BookmarkSelector(UrlNavigator* parent) :
     connect(m_bookmarksMenu, SIGNAL(activated(int)),
             this, SLOT(slotBookmarkActivated(int)));
 
-    setPopup(m_bookmarksMenu);
+    setMenu(m_bookmarksMenu);
 }
 
 BookmarkSelector::~BookmarkSelector()
@@ -86,7 +87,7 @@ void BookmarkSelector::updateSelection(const KUrl& url)
             const int length = bookmarkUrl.prettyUrl().length();
             if (length > maxLength) {
                 m_selectedIndex = i;
-                setPixmap(SmallIcon(bookmark.icon()));
+                setIcon(SmallIcon(bookmark.icon()));
                 maxLength = length;
             }
         }
@@ -97,7 +98,7 @@ void BookmarkSelector::updateSelection(const KUrl& url)
     if (m_selectedIndex < 0) {
         // No bookmark has been found which matches to the given Url. Show
         // a generic folder icon as pixmap for indication:
-        setPixmap(SmallIcon("folder"));
+        setIcon(SmallIcon("folder"));
     }
 }
 
@@ -106,31 +107,39 @@ KBookmark BookmarkSelector::selectedBookmark() const
     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) ||
-        isDisplayHintEnabled(DraggedHint);
+                               isDisplayHintEnabled(DraggedHint);
     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
     const DolphinView* parentView = urlNavigator()->dolphinView();
-    const Dolphin& dolphin = Dolphin::mainWin();
+    const DolphinMainWindow* dolphin = parentView->mainWindow();
 
-    const bool isActive = (dolphin.activeView() == parentView);
+    const bool isActive = (dolphin->activeView() == parentView);
     if (!isActive) {
-        QColor dimmColor(colorGroup().background());
+        QColor dimmColor(palette().brush(QPalette::Background).color());
         foregroundColor = mixColors(foregroundColor, dimmColor);
         if (isHighlighted) {
             backgroundColor = mixColors(backgroundColor, dimmColor);
@@ -140,21 +149,19 @@ void BookmarkSelector::drawButton(QPainter* painter)
     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
-    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
-    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)