X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7fec7ff9a096d288b66fce2699c7b8bc71f6fbbb..4b0293e22ea169b0f8493644f2c4e8ef80e4e8fe:/src/urlnavigatorbutton.cpp

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index 811a11b89..eb372f558 100644
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -40,7 +40,7 @@
 
 #include "urlnavigator.h"
 #include "dolphinview.h"
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 
 UrlNavigatorButton::UrlNavigatorButton(int index, UrlNavigator* parent) :
     UrlButton(parent),
@@ -89,13 +89,16 @@ void UrlNavigatorButton::setIndex(int index)
     update();
 }
 
-int UrlNavigatorButton::index() const
+QSize UrlNavigatorButton::sizeHint() const
 {
-    return m_index;
+    const int width = fontMetrics().width(text()) + (arrowWidth() * 4);
+    return QSize(width, UrlButton::sizeHint().height());
 }
 
-void UrlNavigatorButton::drawButton(QPainter* painter)
+void UrlNavigatorButton::paintEvent(QPaintEvent* event)
 {
+    QPainter painter(this);
+    painter.setClipRect(event->rect());
     const int buttonWidth  = width();
     const int buttonHeight = height();
 
@@ -109,17 +112,17 @@ void UrlNavigatorButton::drawButton(QPainter* painter)
         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);
@@ -127,18 +130,18 @@ void UrlNavigatorButton::drawButton(QPainter* painter)
     }
 
     // draw button background
-    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);
 
     int textWidth = buttonWidth;
     if (isDisplayHintEnabled(ActivatedHint) && isActive || isHighlighted) {
-        painter->setPen(foregroundColor);
+        painter.setPen(foregroundColor);
     }
     else {
         // dimm the foreground color by mixing it with the background
         foregroundColor = mixColors(foregroundColor, backgroundColor);
-        painter->setPen(foregroundColor);
+        painter.setPen(foregroundColor);
     }
 
     if (!isDisplayHintEnabled(ActivatedHint)) {
@@ -150,8 +153,8 @@ void UrlNavigatorButton::drawButton(QPainter* painter)
         const int startTopY = middleY - (width - 1);
         const int startBottomY = middleY + (width - 1);
         for (int i = 0; i < width; ++i) {
-            painter->drawLine(startX, startTopY + i, startX + i, startTopY + i);
-            painter->drawLine(startX, startBottomY - i, startX + i, startBottomY - i);
+            painter.drawLine(startX, startTopY + i, startX + i, startTopY + i);
+            painter.drawLine(startX, startBottomY - i, startX + i, startBottomY - i);
         }
 
         textWidth = startX - border;
@@ -159,7 +162,7 @@ void UrlNavigatorButton::drawButton(QPainter* painter)
 
     const bool clipped = isTextClipped();
     const int align = clipped ? Qt::AlignVCenter : Qt::AlignCenter;
-    painter->drawText(QRect(0, 0, textWidth, buttonHeight), align, text());
+    painter.drawText(QRect(0, 0, textWidth, buttonHeight), align, text());
 
     if (clipped) {
         // Blend the right area of the text with the background, as the
@@ -172,9 +175,9 @@ void UrlNavigatorButton::drawButton(QPainter* painter)
         const int greenInc = (foregroundColor.green() - backgroundColor.green()) / blendSteps;
         const int blueInc  = (foregroundColor.blue()  - backgroundColor.blue())  / blendSteps;
         for (int i = 0; i < blendSteps; ++i) {
-            painter->setClipRect(QRect(textWidth - i, 0, 1, buttonHeight));
-            painter->setPen(blendColor);
-            painter->drawText(QRect(0, 0, textWidth, buttonHeight), align, text());
+            painter.setClipRect(QRect(textWidth - i, 0, 1, buttonHeight));
+            painter.setPen(blendColor);
+            painter.drawText(QRect(0, 0, textWidth, buttonHeight), align, text());
 
             blendColor.setRgb(blendColor.red()   + redInc,
                               blendColor.green() + greenInc,
@@ -190,14 +193,14 @@ void UrlNavigatorButton::enterEvent(QEvent* event)
     // if the text is clipped due to a small window width, the text should
     // be shown as tooltip
     if (isTextClipped()) {
-        QToolTip::add(this, text());
+        setToolTip(text());
     }
 }
 
 void UrlNavigatorButton::leaveEvent(QEvent* event)
 {
     UrlButton::leaveEvent(event);
-    QToolTip::remove(this);
+    setToolTip(QString());
 }
 
 void UrlNavigatorButton::dropEvent(QDropEvent* event)
@@ -256,7 +259,8 @@ void UrlNavigatorButton::startPopupDelay()
         return;
     }
 
-    m_popupDelay->start(300, true);
+    m_popupDelay->setSingleShot(true);
+    m_popupDelay->start(300);
 }
 
 void UrlNavigatorButton::stopPopupDelay()
@@ -280,7 +284,7 @@ void UrlNavigatorButton::startListJob()
 
     connect(m_listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList &)),
             this, SLOT(entriesList(KIO::Job*, const KIO::UDSEntryList&)));
-    connect(m_listJob, SIGNAL(result(KIO::Job*)), this, SLOT(listJobFinished(KIO::Job*)));
+    connect(m_listJob, SIGNAL(result(KJob*)), this, SLOT(listJobFinished(KJob*)));
 }
 
 void UrlNavigatorButton::entriesList(KIO::Job* job, const KIO::UDSEntryList& entries)
@@ -328,7 +332,7 @@ void UrlNavigatorButton::entriesList(KIO::Job* job, const KIO::UDSEntryList& ent
     m_subdirs.sort();
 }
 
-void UrlNavigatorButton::listJobFinished(KIO::Job* job)
+void UrlNavigatorButton::listJobFinished(KJob* job)
 {
     if (job != m_listJob) {
         return;
@@ -348,8 +352,8 @@ void UrlNavigatorButton::listJobFinished(KIO::Job* job)
     int i = 0;
     while (it != itEnd) {
         dirsMenu->insertItem(*it, i);
-        ++i;
         ++it;
+        ++i;
     }
 
     int result = dirsMenu->exec(urlNavigator()->mapToGlobal(geometry().bottomLeft()));