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

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index 9616558a5..c97a560ba 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()));
 }
@@ -237,6 +236,8 @@ void UrlNavigatorButton::dragLeaveEvent(QDragLeaveEvent* event)
 
 void UrlNavigatorButton::updateNavigatorUrl()
 {
+    stopPopupDelay();
+
     if (m_index < 0) {
         return;
     }
@@ -246,18 +247,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 +265,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,6 +286,8 @@ void UrlNavigatorButton::entriesList(KIO::Job* job, const KIO::UDSEntryList& ent
 
     KIO::UDSEntryList::const_iterator it = entries.constBegin();
     KIO::UDSEntryList::const_iterator itEnd = entries.constEnd();
+
+    bool showHidden = urlNavigator()->showHiddenFiles();
     while (it != itEnd) {
         QString name;
         //bool isDir = false;
@@ -314,7 +316,11 @@ void UrlNavigatorButton::entriesList(KIO::Job* job, const KIO::UDSEntryList& ent
         */
 
         if (entry.isDir()) {
-            m_subdirs.append(entry.stringValue(KIO::UDS_NAME));
+            QString dir = entry.stringValue(KIO::UDS_NAME);
+
+            if (!showHidden || (dir != "." && dir != "..")) {
+                m_subdirs.append(entry.stringValue(KIO::UDS_NAME));
+            }
         }
 
         ++it;
@@ -336,20 +342,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 +366,8 @@ void UrlNavigatorButton::listJobFinished(KJob* job)
     m_listJob = 0;
     m_subdirs.clear();
     delete dirsMenu;
+    dirsMenu = 0;
+
     setDisplayHintEnabled(PopupActiveHint, false);
 }