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

3 files changed, 37 insertions, 36 deletions

diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index d3b64fbfe..2d2d25ed2 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -24,18 +24,20 @@
 //
 //=================================================================================
 
-
-#include "kvi_tal_listview.h"
-#include <q3header.h>
-#include <qevent.h>
 #include "class_listview.h"
+
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
+#include "kvi_tal_listview.h"
 
-
+// FIXME: Qt4 #include <QHeaderView>
+#include <q3header.h>
+#include <QEvent>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QUrl>
 
 /*
 	@doc: listview
@@ -520,7 +522,7 @@ KviKvsMdmListView::~KviKvsMdmListView()
 
 void KviKvsMdmListView::contentsDragEnterEvent( QDragEnterEvent *e )
 {
-		if ( !KviUriDrag::canDecode(e))
+		if(!e->mimeData()->hasUrls())
 		{
 			e->ignore();
 			return;
@@ -528,26 +530,29 @@ void KviKvsMdmListView::contentsDragEnterEvent( QDragEnterEvent *e )
 
 }
 
-
 void KviKvsMdmListView::contentsDropEvent(QDropEvent *e)
 {
-	QStringList list;
-	if(KviUriDrag::decodeLocalFiles(e,list))
+	QList<QUrl> list;
+	if(e->mimeData()->hasUrls())
 	{
+		list = e->mimeData()->urls();
+
 		if(!list.isEmpty())
 		{
-			QStringList::ConstIterator it = list.begin(); //kewl ! :)
+			QList<QUrl>::Iterator it = list.begin();
 			for( ; it != list.end(); ++it )
 			{
-				QString tmp = *it; //wow :)
+				QUrl url = *it;
+				QString path = url.path();
 				#ifndef COMPILE_ON_WINDOWS
-					if(tmp[0] != '/')tmp.prepend("/"); //HACK HACK HACK for Qt bug (?!?)
+					if(path[0] != '/')path.prepend("/"); //HACK HACK HACK for Qt bug (?!?)
 				#endif
 				KviTalListViewItem *i = itemAt( contentsToViewport(e->pos()) );
-				m_pParentScript->fileDropped(tmp,i);
+				m_pParentScript->fileDropped(path,i);
 			}
 		}
 	}
 
 }
+
 #include "m_class_listview.moc"
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 16fc3f2fc..9603fa68a 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -25,17 +25,15 @@
 #include "controller.h"
 
 #include "kvi_module.h"
-
 #include "kvi_fileutils.h"
 #include "kvi_app.h"
 #include "kvi_locale.h"
-
 #include "kvi_console.h"
 #include "kvi_options.h"
 #include "kvi_out.h"
 
-#include <qfile.h>
-#include <qclipboard.h>
+#include <QFile>
+#include <QClipboard>
 
 #ifndef COMPILE_ON_WINDOWS
     #include <unistd.h>
@@ -105,7 +103,7 @@ static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c)
 
 	if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile.ascii())))
 	{
-        c->warning(__tr2qs("File not found or empty"));
+		c->warning(__tr2qs("File not found or empty"));
 		return false;
 	}
 
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();
 }