don't trigger an item if the user does a selection by using the control- or shift...

[dolphin.git] / src / urlnavigatorbutton.cpp

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index 44b7ae9669294e0328fa71f249d0262eca20076a..9fe2186dab1dec9ed9c8e355467a6a832bd9d907 100644 (file)
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -15,7 +15,7 @@
  *   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"


@@ -209,28 +209,31 @@ 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));
+        DolphinMainWindow* win = urlNavigator()->dolphinView()->mainWindow();
+        win->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)