ported drag'n'drop;

added accel key L for spaste.file;
small fixes around;


git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1306 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 15 insertions, 17 deletions

diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index f697046a5..e9b8bbf90 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -22,6 +22,7 @@
 //=============================================================================
 
 #include "toolbareditor.h"
+
 #include "kvi_actiondrawer.h"
 #include "kvi_locale.h"
 #include "kvi_frame.h"
@@ -36,18 +37,18 @@
 #include "kvi_kvs_useraction.h"
 #include "kvi_draganddrop.h"
 
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qapplication.h>
-#include <qtooltip.h>
-
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qframe.h>
-#include <qdir.h>
-#include <qtimer.h>
-#include <qevent.h>
+#include <QPushButton>
+#include <QLayout>
+#include <QApplication>
+#include <QToolTip>
+#include <QLineEdit>
+#include <QLabel>
+#include <QMessageBox>
+#include <QFrame>
+#include <QDir>
+#include <QTimer>
+#include <QEvent>
+#include <QDropEvent>
 
 KviCustomizeToolBarsDialog * KviCustomizeToolBarsDialog::m_pInstance = 0;
 extern QRect g_rectToolBarEditorDialogGeometry;
@@ -105,15 +106,12 @@ void KviTrashcanLabel::heartbeat()
 
 void KviTrashcanLabel::dropEvent(QDropEvent * e)
 {
-	if(KviTextDrag::canDecode(e))
-		e->accept();
+	if(e->mimeData()->hasUrls()) e->acceptProposedAction();
 }
 
 void KviTrashcanLabel::dragEnterEvent(QDragEnterEvent * e)
 {
-	QString s;
-	if(KviTextDrag::decode(e,s))
-		e->accept();
+	if(e->mimeData()->hasUrls()) e->acceptProposedAction();
 }