diff options
| author |  Noldor | 2009-01-22 21:28:35 +0000 |
|---|---|---|
| committer | Noldor | 2009-01-22 21:28:35 +0000 |
| commit | 76e3e9f1cf5c1b49c11e3aaeea776a48570088e3 (patch) | |
| tree | b139d92feed5415555b6a1528816375b676225bf /src/modules | |
| parent | re-enabled global acceletators (diff) | |
| download | KVIrc-76e3e9f1cf5c1b49c11e3aaeea776a48570088e3.tar.gz KVIrc-76e3e9f1cf5c1b49c11e3aaeea776a48570088e3.tar.bz2 KVIrc-76e3e9f1cf5c1b49c11e3aaeea776a48570088e3.zip | |
Fixed drag'n drop in kvs class listview
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3026 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/objects/class_memorybuffer.cpp | 11 | ||||
| -rw-r--r-- | src/modules/objects/class_treewidget.cpp | 17 | ||||
| -rw-r--r-- | src/modules/objects/class_treewidget.h | 1 |
3 files changed, 19 insertions, 10 deletions
diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp index 4e6e71c4e..11cc32f47 100644 --- a/src/modules/objects/class_memorybuffer.cpp +++ b/src/modules/objects/class_memorybuffer.cpp @@ -84,10 +84,15 @@ KVSO_CLASS_FUNCTION(memorybuffer,loadFromFile) KVSO_PARAMETERS_END(c)
if(KviFileUtils::fileExists(szFileName))
{
+
KviFile f(szFileName);
- f.open(QIODevice::ReadOnly);
- f.load(*m_pBuffer);
- f.close();
+ debug("loading file %s",szFileName.toUtf8().data());
+ if (f.open(QIODevice::ReadOnly))
+ {
+ f.load(*m_pBuffer);
+ f.close();
+ }
+ else debug("Error in load file!");
}
else c->warning(__tr2qs_ctx("The file '%Q' does not exist","objects"),&szFileName);
return true;
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp index 877b05e82..8ef93deae 100644 --- a/src/modules/objects/class_treewidget.cpp +++ b/src/modules/objects/class_treewidget.cpp @@ -623,14 +623,17 @@ KviKvsTreeWidget::~KviKvsTreeWidget() void KviKvsTreeWidget::dragEnterEvent( QDragEnterEvent * e ) { - debug("Drag enter event"); - if(!e->mimeData()->hasUrls()) + if(!e->mimeData()->hasUrls()) { - debug("Ignore drag"); - e->ignore(); + e->ignore(); return; } - e->accept(); + e->acceptProposedAction(); +} + +void KviKvsTreeWidget::dragMoveEvent( QDragMoveEvent * e ) +{ + // ?#! } void KviKvsTreeWidget::dropEvent(QDropEvent * e) @@ -652,8 +655,8 @@ void KviKvsTreeWidget::dropEvent(QDropEvent * e) #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) if(path[0] != '/')path.prepend("/"); //HACK HACK HACK for Qt bug (?!?) #endif - // QTreeWidgetItem *i = itemAt( contentsToViewport(e->pos()) ); - // m_pParentScript->fileDropped(path,i); + QTreeWidgetItem *i = itemAt( e->pos() ); + m_pParentScript->fileDropped(path,i); } } } diff --git a/src/modules/objects/class_treewidget.h b/src/modules/objects/class_treewidget.h index 1ad02d13a..970c21c1d 100644 --- a/src/modules/objects/class_treewidget.h +++ b/src/modules/objects/class_treewidget.h @@ -93,6 +93,7 @@ protected: protected: void dropEvent(QDropEvent * e); void dragEnterEvent(QDragEnterEvent * e); + void dragMoveEvent( QDragMoveEvent * e ); }; #endif // _CLASS_TREEWIDGET_H_ |