X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/175fe7ff47ccff39b0e77f80491a9701d025375e..1554df47db71bbbbae4be1431eaba5cd2c442e0c:/src/urlnavigatorbutton.cpp

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index 9616558a5..2925ed350 100644
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -24,15 +24,13 @@
 
 #include "urlnavigator.h"
 
-#include <kglobalsettings.h>
-#include <kiconloader.h>
 #include <kio/job.h>
 #include <kio/jobclasses.h>
-#include <klocale.h>
-#include <kurl.h>
+#include <kglobalsettings.h>
+#include <kmenu.h>
 
-#include <Q3PopupMenu>
 #include <QPainter>
+#include <QPaintEvent>
 #include <QTimer>
 
 UrlNavigatorButton::UrlNavigatorButton(int index, UrlNavigator* parent) :
@@ -47,6 +45,7 @@ UrlNavigatorButton::UrlNavigatorButton(int index, UrlNavigator* parent) :
     connect(this, SIGNAL(clicked()), this, SLOT(updateNavigatorUrl()));
 
     m_popupDelay = new QTimer(this);
+    m_popupDelay->setSingleShot(true);
     connect(m_popupDelay, SIGNAL(timeout()), this, SLOT(startListJob()));
     connect(this, SIGNAL(pressed()), this, SLOT(startPopupDelay()));
 }
@@ -153,27 +152,19 @@ void UrlNavigatorButton::paintEvent(QPaintEvent* event)
 
     const bool clipped = isTextClipped();
     const int align = clipped ? Qt::AlignVCenter : Qt::AlignCenter;
-    painter.drawText(QRect(0, 0, textWidth, buttonHeight), align, text());
-
+    const QRect textRect(0, 0, textWidth, buttonHeight);
     if (clipped) {
-        // Blend the right area of the text with the background, as the
-        // text is clipped.
-        // TODO: use alpha blending in Qt4 instead of drawing the text that often
-        const int blendSteps = 16;
-
-        QColor blendColor(backgroundColor);
-        const int redInc   = (foregroundColor.red()   - backgroundColor.red())   / blendSteps;
-        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());
-
-            blendColor.setRgb(blendColor.red()   + redInc,
-                              blendColor.green() + greenInc,
-                              blendColor.blue()  + blueInc);
-        }
+        QLinearGradient gradient(textRect.topLeft(), textRect.topRight());
+        gradient.setColorAt(0.8, foregroundColor);
+        gradient.setColorAt(1.0, backgroundColor);
+
+        QPen pen;
+        pen.setBrush(QBrush(gradient));
+        painter.setPen(pen);
+        painter.drawText(textRect, align, text());
+    }
+    else {
+        painter.drawText(textRect, align, text());
     }
 }
 
@@ -237,6 +228,8 @@ void UrlNavigatorButton::dragLeaveEvent(QDragLeaveEvent* event)
 
 void UrlNavigatorButton::updateNavigatorUrl()
 {
+    stopPopupDelay();
+
     if (m_index < 0) {
         return;
     }
@@ -246,18 +239,17 @@ void UrlNavigatorButton::updateNavigatorUrl()
 
 void UrlNavigatorButton::startPopupDelay()
 {
-    if (m_popupDelay->isActive() || m_listJob || m_index < 0) {
+    if (m_popupDelay->isActive() || (m_listJob != 0) || (m_index < 0)) {
         return;
     }
 
-    m_popupDelay->setSingleShot(true);
     m_popupDelay->start(300);
 }
 
 void UrlNavigatorButton::stopPopupDelay()
 {
     m_popupDelay->stop();
-    if (m_listJob) {
+    if (m_listJob != 0) {
         m_listJob->kill();
         m_listJob = 0;
     }
@@ -265,12 +257,12 @@ void UrlNavigatorButton::stopPopupDelay()
 
 void UrlNavigatorButton::startListJob()
 {
-    if (m_listJob) {
+    if (m_listJob != 0) {
         return;
     }
 
-    KUrl url = urlNavigator()->url(m_index);
-    m_listJob = KIO::listDir(url, false, false);
+    const KUrl& url = urlNavigator()->url(m_index);
+    m_listJob = KIO::listDir(url, false, urlNavigator()->showHiddenFiles());
     m_subdirs.clear(); // just to be ++safe
 
     connect(m_listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList &)),
@@ -286,35 +278,16 @@ void UrlNavigatorButton::entriesList(KIO::Job* job, const KIO::UDSEntryList& ent
 
     KIO::UDSEntryList::const_iterator it = entries.constBegin();
     KIO::UDSEntryList::const_iterator itEnd = entries.constEnd();
-    while (it != itEnd) {
-        QString name;
-        //bool isDir = false;
-        KIO::UDSEntry entry = *it;
-
-        /* KDE3 reference:
-            KIO::UDSEntry::const_iterator atomIt = entry.constBegin();
-            KIO::UDSEntry::const_iterator atomEndIt = entry.constEnd();
-
-            while (atomIt != atomEndIt) {
-            switch ((*atomIt).m_uds) {
-                case KIO::UDS_NAME:
-                    name = (*atomIt).m_str;
-                    break;
-                case KIO::UDS_FILE_TYPE:
-                    isDir = S_ISDIR((*atomIt).m_long);
-                    break;
-                default:
-                    break;
-            }
-            ++atomIt;
-         }
-         if (isDir) {
-             m_subdirs.append(name);
-         }
-        */
 
+    bool showHidden = urlNavigator()->showHiddenFiles();
+    while (it != itEnd) {
+        const KIO::UDSEntry entry = *it;
         if (entry.isDir()) {
-            m_subdirs.append(entry.stringValue(KIO::UDS_NAME));
+            QString name = entry.stringValue(KIO::UDS_NAME);
+
+            if (!showHidden || (name != "." && name != "..")) {
+                m_subdirs.append(name);
+            }
         }
 
         ++it;
@@ -336,20 +309,22 @@ void UrlNavigatorButton::listJobFinished(KJob* job)
 
     setDisplayHintEnabled(PopupActiveHint, true);
     update(); // ensure the button is drawn highlighted
-    Q3PopupMenu* dirsMenu = new Q3PopupMenu(this);
-    //setMenu(dirsMenu);
+
+    KMenu* dirsMenu = new KMenu(this);
     QStringList::const_iterator it = m_subdirs.constBegin();
     QStringList::const_iterator itEnd = m_subdirs.constEnd();
     int i = 0;
     while (it != itEnd) {
-        dirsMenu->insertItem(*it, i);
+        QAction* action = new QAction(*it, this);
+        action->setData(i);
+        dirsMenu->addAction(action);
         ++it;
         ++i;
     }
 
-    int result = dirsMenu->exec(urlNavigator()->mapToGlobal(geometry().bottomLeft()));
-
-    if (result != -1) {
+    const QAction* action = dirsMenu->exec(urlNavigator()->mapToGlobal(geometry().bottomLeft()));
+    if (action != 0) {
+        const int result = action->data().toInt();
         KUrl url = urlNavigator()->url(m_index);
         url.addPath(m_subdirs[result]);
         urlNavigator()->setUrl(url);
@@ -358,6 +333,8 @@ void UrlNavigatorButton::listJobFinished(KJob* job)
     m_listJob = 0;
     m_subdirs.clear();
     delete dirsMenu;
+    dirsMenu = 0;
+
     setDisplayHintEnabled(PopupActiveHint, false);
 }