Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / urlnavigatorbutton.cpp

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index f9c5b407b68b7bcb8ead7c0cd883aa4d4b4f71c9..3be037ced8d6b5d876e75aa78803e47f6e32bad4 100644 (file)
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -15,36 +15,28 @@
  *   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.,                                       *
  *   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          *

  ***************************************************************************/
 
 #include "urlnavigatorbutton.h"
  ***************************************************************************/
 
 #include "urlnavigatorbutton.h"

-#include <qcursor.h>
-#include <qfontmetrics.h>
-#include <qpainter.h>
-#include <qtimer.h>
-#include <qtooltip.h>
-//Added by qt3to4:
-#include <QDropEvent>
-#include <QDragLeaveEvent>
-#include <Q3PopupMenu>
-#include <QEvent>
-#include <QDragEnterEvent>

 
 

-#include <kglobalsettings.h>
-#include <kiconloader.h>
-#include <kio/jobclasses.h>
-#include <klocale.h>
-#include <kurl.h>

 #include <assert.h>
 
 #include "urlnavigator.h"
 #include <assert.h>
 
 #include "urlnavigator.h"

-#include "dolphinview.h"
-#include "dolphin.h"
+
+#include <kio/job.h>
+#include <kio/jobclasses.h>
+#include <kglobalsettings.h>
+#include <kmenu.h>
+
+#include <QPainter>
+#include <QPaintEvent>
+#include <QTimer>

 
 UrlNavigatorButton::UrlNavigatorButton(int index, UrlNavigator* parent) :
     UrlButton(parent),
     m_index(-1),
 
 UrlNavigatorButton::UrlNavigatorButton(int index, UrlNavigator* parent) :
     UrlButton(parent),
     m_index(-1),

+    m_popupDelay(0),

     m_listJob(0)
 {
     setAcceptDrops(true);
     m_listJob(0)
 {
     setAcceptDrops(true);


@@ -53,6 +45,7 @@ UrlNavigatorButton::UrlNavigatorButton(int index, UrlNavigator* parent) :
     connect(this, SIGNAL(clicked()), this, SLOT(updateNavigatorUrl()));
 
     m_popupDelay = new QTimer(this);
     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()));
 }
     connect(m_popupDelay, SIGNAL(timeout()), this, SLOT(startListJob()));
     connect(this, SIGNAL(pressed()), this, SLOT(startPopupDelay()));
 }


@@ -98,6 +91,7 @@ QSize UrlNavigatorButton::sizeHint() const
 void UrlNavigatorButton::paintEvent(QPaintEvent* event)
 {
     QPainter painter(this);
 void UrlNavigatorButton::paintEvent(QPaintEvent* event)
 {
     QPainter painter(this);

+    painter.setClipRect(event->rect());

     const int buttonWidth  = width();
     const int buttonHeight = height();
 
     const int buttonWidth  = width();
     const int buttonHeight = height();
 


@@ -111,17 +105,14 @@ void UrlNavigatorButton::paintEvent(QPaintEvent* event)
         foregroundColor = KGlobalSettings::highlightedTextColor();
     }
     else {
         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
         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 bool isActive = (dolphin.activeView() == parentView);
+    const bool isActive = urlNavigator()->isActive();

     if (!isActive) {
     if (!isActive) {

-        QColor dimmColor(colorGroup().background());
+        QColor dimmColor(palette().brush(QPalette::Background).color());

         foregroundColor = mixColors(foregroundColor, dimmColor);
         if (isHighlighted) {
             backgroundColor = mixColors(backgroundColor, dimmColor);
         foregroundColor = mixColors(foregroundColor, dimmColor);
         if (isHighlighted) {
             backgroundColor = mixColors(backgroundColor, dimmColor);


@@ -192,14 +183,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()) {
     // 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);
     }
 }
 
 void UrlNavigatorButton::leaveEvent(QEvent* event)
 {
     UrlButton::leaveEvent(event);

-    QToolTip::remove(this);
+    setToolTip(QString());

 }
 
 void UrlNavigatorButton::dropEvent(QDropEvent* event)
 }
 
 void UrlNavigatorButton::dropEvent(QDropEvent* event)


@@ -208,28 +199,30 @@ void UrlNavigatorButton::dropEvent(QDropEvent* event)
         return;
     }
 
         return;
     }
 

-    KUrl::List urls;
-    /* KDE4-TODO:
-    if (KUrlDrag::decode(event, urls) && !urls.isEmpty()) {
+    const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
+    if (!urls.isEmpty()) {
+        event->acceptProposedAction();
+

         setDisplayHintEnabled(DraggedHint, true);
 
         QString path(urlNavigator()->url().prettyUrl());
         setDisplayHintEnabled(DraggedHint, true);
 
         QString path(urlNavigator()->url().prettyUrl());

-        path = path.section('/', 0, m_index);
+        path = path.section('/', 0, m_index + 2);

 
 

-        Dolphin::mainWin().dropUrls(urls, KUrl(path));
+        urlNavigator()->dropUrls(urls, KUrl(path));

 
         setDisplayHintEnabled(DraggedHint, false);
         update();
 
         setDisplayHintEnabled(DraggedHint, false);
         update();

-    }*/
+    }

 }
 
 void UrlNavigatorButton::dragEnterEvent(QDragEnterEvent* event)
 {
 }
 
 void UrlNavigatorButton::dragEnterEvent(QDragEnterEvent* event)
 {

-    /* KDE4-TODO:
-    event->accept(KUrlDrag::canDecode(event));
+    if (event->mimeData()->hasUrls()) {
+        setDisplayHintEnabled(DraggedHint, true);
+        event->acceptProposedAction();

 
 

-    setDisplayHintEnabled(DraggedHint, true);*/
-    update();
+        update();
+    }

 }
 
 void UrlNavigatorButton::dragLeaveEvent(QDragLeaveEvent* event)
 }
 
 void UrlNavigatorButton::dragLeaveEvent(QDragLeaveEvent* event)


@@ -243,28 +236,28 @@ void UrlNavigatorButton::dragLeaveEvent(QDragLeaveEvent* event)
 
 void UrlNavigatorButton::updateNavigatorUrl()
 {
 
 void UrlNavigatorButton::updateNavigatorUrl()
 {

+    stopPopupDelay();
+

     if (m_index < 0) {
         return;
     }
 
     if (m_index < 0) {
         return;
     }
 

-    UrlNavigator* navigator = urlNavigator();
-    assert(navigator != 0);
-    navigator->setUrl(navigator->url(m_index));
+    urlNavigator()->setUrl(urlNavigator()->url(m_index));

 }
 
 void UrlNavigatorButton::startPopupDelay()
 {
 }
 
 void UrlNavigatorButton::startPopupDelay()
 {

-    if (m_popupDelay->isActive() || m_listJob || m_index < 0) {
+    if (m_popupDelay->isActive() || (m_listJob != 0) || (m_index < 0)) {

         return;
     }
 
         return;
     }
 

-    m_popupDelay->start(300, true);
+    m_popupDelay->start(300);

 }
 
 void UrlNavigatorButton::stopPopupDelay()
 {
     m_popupDelay->stop();
 }
 
 void UrlNavigatorButton::stopPopupDelay()
 {
     m_popupDelay->stop();

-    if (m_listJob) {
+    if (m_listJob != 0) {

         m_listJob->kill();
         m_listJob = 0;
     }
         m_listJob->kill();
         m_listJob = 0;
     }


@@ -272,11 +265,11 @@ void UrlNavigatorButton::stopPopupDelay()
 
 void UrlNavigatorButton::startListJob()
 {
 
 void UrlNavigatorButton::startListJob()
 {

-    if (m_listJob) {
+    if (m_listJob != 0) {

         return;
     }
 
         return;
     }
 

-    KUrl url = urlNavigator()->url(m_index);
+    const KUrl& url = urlNavigator()->url(m_index);

     m_listJob = KIO::listDir(url, false, false);
     m_subdirs.clear(); // just to be ++safe
 
     m_listJob = KIO::listDir(url, false, false);
     m_subdirs.clear(); // just to be ++safe
 


@@ -295,7 +288,7 @@ void UrlNavigatorButton::entriesList(KIO::Job* job, const KIO::UDSEntryList& ent
     KIO::UDSEntryList::const_iterator itEnd = entries.constEnd();
     while (it != itEnd) {
         QString name;
     KIO::UDSEntryList::const_iterator itEnd = entries.constEnd();
     while (it != itEnd) {
         QString name;

-        bool isDir = false;
+        //bool isDir = false;

         KIO::UDSEntry entry = *it;
 
         /* KDE3 reference:
         KIO::UDSEntry entry = *it;
 
         /* KDE3 reference:


@@ -343,20 +336,22 @@ void UrlNavigatorButton::listJobFinished(KJob* job)
 
     setDisplayHintEnabled(PopupActiveHint, true);
     update(); // ensure the button is drawn highlighted
 
     setDisplayHintEnabled(PopupActiveHint, true);
     update(); // ensure the button is drawn highlighted

-    Q3PopupMenu* dirsMenu = new Q3PopupMenu(this);
-    //setPopup(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) {
     QStringList::const_iterator it = m_subdirs.constBegin();
     QStringList::const_iterator itEnd = m_subdirs.constEnd();
     int i = 0;
     while (it != itEnd) {

-        dirsMenu->insertItem(*it, i);
-        ++i;
+        QAction* action = new QAction(*it, this);
+        action->setData(i);
+        dirsMenu->addAction(action);

         ++it;
         ++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);
         KUrl url = urlNavigator()->url(m_index);
         url.addPath(m_subdirs[result]);
         urlNavigator()->setUrl(url);


@@ -365,6 +360,8 @@ void UrlNavigatorButton::listJobFinished(KJob* job)
     m_listJob = 0;
     m_subdirs.clear();
     delete dirsMenu;
     m_listJob = 0;
     m_subdirs.clear();
     delete dirsMenu;

+    dirsMenu = 0;
+

     setDisplayHintEnabled(PopupActiveHint, false);
 }
 
     setDisplayHintEnabled(PopupActiveHint, false);
 }