Simplify drag-and-drop of URLs. Remove the popup menu as per BUG:66479 . ...

Simplify drag-and-drop of URLs.  Remove the popup menu as per BUG:66479 .  Also correct the quoting logic to apply regardless of the number of urls.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=707519

src/TerminalDisplay.cpp

@@ -270,7 +270,6 @@ TerminalDisplay::TerminalDisplay(QWidget *parent)
 ,_printerFriendly(false)
 ,_printerBold(false)
 ,_isFixedSize(false)
-,_drop(0)
 ,_possibleTripleClick(false)
 ,_resizeWidget(0)
 ,_resizeLabel(0)
@@ -2613,71 +2612,41 @@ void TerminalDisplay::dragEnterEvent(QDragEnterEvent* event)
       event->acceptProposedAction();
 }
 
-enum dropPopupOptions { paste, cd, cp, ln, mv };
-
 void TerminalDisplay::dropEvent(QDropEvent* event)
 {
-   if (_drop==0)
-   {
-      _drop = new KMenu( this );
-      _pasteAction = _drop->addAction( i18n( "Paste" ) );
-      _drop->addSeparator();
-      _cdAction = _drop->addAction( i18n( "Change Directory" ) );
-      _mvAction = _drop->addAction( i18n( "Move Here" ) );
-      _cpAction = _drop->addAction( i18n( "Copy Here" ) );
-      _lnAction = _drop->addAction( i18n( "Link Here" ) );
-      _pasteAction->setData( QVariant( paste ) );
-      _cdAction->setData( QVariant( cd ) );
-      _mvAction->setData( QVariant( mv ) );
-      _cpAction->setData( QVariant( cp ) );
-      _lnAction->setData( QVariant( ln ) );
-      connect(_drop, SIGNAL(triggered(QAction*)), SLOT(drop_menu_activated(QAction*)));
-   };
-    // The current behaviour when url(s) are dropped is
-    // * if there is only ONE url and if it's a LOCAL one, ask for paste or cd/cp/ln/mv
-    // * if there are only LOCAL urls, ask for paste or cp/ln/mv
-    // * in all other cases, just paste
-    //   (for non-local ones, or for a list of URLs, 'cd' is nonsense)
-  _dndFileCount = 0;
-  _dropText = "";
-  bool justPaste = true;
-
-  KUrl::List urllist = KUrl::List::fromMimeData(event->mimeData());
-  if (urllist.count()) {
-    justPaste =false;
-    KUrl::List::Iterator it;
-
-    _cdAction->setEnabled( true );
-    _lnAction->setEnabled( true );
-
-    for ( it = urllist.begin(); it != urllist.end(); ++it ) {
-      if(_dndFileCount++ > 0) {
-        _dropText += ' ';
-        _cdAction->setEnabled( false );
-      }
-      KUrl url = KIO::NetAccess::mostLocalUrl( *it, 0 );
-      QString tmp;
-      if (url.isLocalFile()) {
-        tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others
-      } else if ( url.protocol() == QLatin1String( "mailto" ) ) {
-        justPaste = true;
-        break;
-      } else {
-        tmp = url.url();
-        _cdAction->setEnabled( false );
-        _lnAction->setEnabled( false );
-      }
-      if (urllist.count()>1)
-        tmp = KShell::quoteArg(tmp);
-      _dropText += tmp;
-    }
+  KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
+
+  QString dropText;
+  if (!urls.isEmpty()) 
+  {
+    for ( int i = 0 ; i < urls.count() ; i++ ) 
+    {
+        KUrl url = KIO::NetAccess::mostLocalUrl( urls[i] , 0 );
+        QString urlText;
 
-    if (!justPaste) _drop->popup(mapToGlobal(event->pos()));
+        if (url.isLocalFile())
+            urlText = url.path(); 
+        else
+            urlText = url.url();
+    
+        // in future it may be useful to be able to insert file names with drag-and-drop
+        // without quoting them (this only affects paths with spaces in) 
+        urlText = KShell::quoteArg(urlText);
+      
+        dropText += urlText;
+
+        if ( i != urls.count()-1 ) 
+            dropText += ' ';
+    }
+  }
+  else 
+  {
+    dropText = event->mimeData()->text();
   }
-  if(justPaste && event->mimeData()->hasFormat("text/plain")) {
-    kDebug(1211) << "Drop:" << _dropText.toLocal8Bit() << "\n";
-    emit sendStringToEmu(_dropText.toLocal8Bit());
-    // Paste it
+
+  if(event->mimeData()->hasFormat("text/plain")) 
+  {
+    emit sendStringToEmu(dropText.toLocal8Bit());
   }
 }
 
@@ -2692,53 +2661,6 @@ void TerminalDisplay::doDrag()
   // Don't delete the QTextDrag object.  Qt will delete it when it's done with it.
 }
 
-void TerminalDisplay::drop_menu_activated(QAction* action)
-{
-  int item = action->data().toInt();
-  switch (item)
-  {
-   case paste:
-      if (_dndFileCount==1)
-        _dropText = KShell::quoteArg(_dropText);
-      emit sendStringToEmu(_dropText.toLocal8Bit());
-      activateWindow();
-      break;
-   case cd:
-     emit sendStringToEmu("cd ");
-      struct stat statbuf;
-      if ( ::stat( QFile::encodeName( _dropText ), &statbuf ) == 0 )
-      {
-         if ( !S_ISDIR(statbuf.st_mode) )
-         {
-            KUrl url;
-            url.setPath( _dropText );
-            _dropText = url.directory( KUrl::ObeyTrailingSlash ); // remove filename
-         }
-      }
-      _dropText = KShell::quoteArg(_dropText);
-      emit sendStringToEmu(_dropText.toLocal8Bit());
-      emit sendStringToEmu("\n");
-      activateWindow();
-      break;
-   case cp:
-     emit sendStringToEmu("kfmclient copy " );
-     break;
-   case ln:
-     emit sendStringToEmu("ln -s ");
-     break;
-   case mv:
-     emit sendStringToEmu("kfmclient move " );
-     break;
-   }
-   if (item>cd && item<=mv) {
-      if (_dndFileCount==1)
-        _dropText = KShell::quoteArg(_dropText);
-      emit sendStringToEmu(_dropText.toLocal8Bit());
-      emit sendStringToEmu(" .\n");
-      activateWindow();
-   }
-}
-
 void TerminalDisplay::outputSuspended(bool suspended)
 {
 	//create the label when this function is first called

src/TerminalDisplay.h

@@ -522,7 +522,6 @@ protected slots:
 
 private slots:
 
-    void drop_menu_activated(QAction*);
     void swapColorTable();
     void tripleClickTimeout();  // resets possibleTripleClick
 
@@ -692,12 +691,6 @@ private:
 
     QRgb _blendColor;
 
-    QAction* _pasteAction;
-    QAction* _cdAction;
-    QAction* _cpAction;
-    QAction* _mvAction;
-    QAction* _lnAction;
-
     // list of filters currently applied to the display.  used for links and
     // search highlight
     TerminalImageFilterChain* _filterChain;
@@ -709,9 +702,6 @@ private:
     // color of the character under the cursor is used
     QColor _cursorColor;  
 
-    // set to true when keyboard-based text selection is active
-    bool _keyboardTextSelectionActive;
-
 	//the delay in milliseconds between redrawing blinking text
 	static const int BLINK_DELAY = 500;
     static bool HAVE_TRANSPARENCY;