Patch by Luca Gugelmann: get rid of any mainwindow dependency from the sidebars.

[dolphin.git] / src / urlnavigatorbutton.cpp

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index fd8b7c225975188d9e8998ad6e5ac399ea7d40b4..6c89e5098f1bf996d59375fef6a46245889af3b6 100644 (file)
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -45,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()));
 }
@@ -151,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());
     }
 }
 
@@ -235,6 +228,8 @@ void UrlNavigatorButton::dragLeaveEvent(QDragLeaveEvent* event)
 
 void UrlNavigatorButton::updateNavigatorUrl()
 {
+    stopPopupDelay();
+
     if (m_index < 0) {
         return;
     }
@@ -244,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;
     }
@@ -263,12 +257,12 @@ void UrlNavigatorButton::stopPopupDelay()
 
 void UrlNavigatorButton::startListJob()
 {
-    if (m_listJob) {
+    if (m_listJob != 0) {
         return;
     }
 
     const KUrl& url = urlNavigator()->url(m_index);
-    m_listJob = KIO::listDir(url, false, false);
+    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 &)),
@@ -284,6 +278,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;
@@ -312,7 +308,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;