diff --git a/lib/draghelper.cpp b/lib/draghelper.cpp index 571dee3..f720389 100644 --- a/lib/draghelper.cpp +++ b/lib/draghelper.cpp @@ -1,80 +1,85 @@ /*************************************************************************** * Copyright (C) 2013 by Eike Hein * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * 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., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ #include "draghelper.h" #include #include #include #include using namespace Milou; DragHelper::DragHelper(QObject* parent) : QObject(parent) , m_dragIconSize(32) { qmlRegisterType(); } DragHelper::~DragHelper() { } int DragHelper::dragIconSize() const { return m_dragIconSize; } void DragHelper::setDragIconSize(int size) { if (m_dragIconSize != size) { m_dragIconSize = size; emit dragIconSizeChanged(); } } bool DragHelper::isDrag(int oldX, int oldY, int newX, int newY) const { return ((QPoint(oldX, oldY) - QPoint(newX, newY)).manhattanLength() >= QApplication::startDragDistance()); } void DragHelper::startDrag(QQuickItem *item, QMimeData *mimeData, const QIcon &icon) { // This allows the caller to return, making sure we don't crash if // the caller is destroyed mid-drag QMetaObject::invokeMethod(this, "doDrag", Qt::QueuedConnection, Q_ARG(QQuickItem*, item), Q_ARG(QMimeData*, mimeData), Q_ARG(QIcon, icon)); } +void DragHelper::startDrag(QQuickItem *item, QMimeData *mimeData, const QString &iconName) +{ + startDrag(item, mimeData, QIcon::fromTheme(iconName)); +} + void DragHelper::doDrag(QQuickItem *item, QMimeData *mimeData, const QIcon &icon) const { QDrag *drag = new QDrag(item); drag->setMimeData(mimeData); if (!icon.isNull()) { drag->setPixmap(icon.pixmap(m_dragIconSize, m_dragIconSize)); } drag->exec(); emit dropped(); } diff --git a/lib/draghelper.h b/lib/draghelper.h index d68f967..bff8104 100644 --- a/lib/draghelper.h +++ b/lib/draghelper.h @@ -1,59 +1,61 @@ /*************************************************************************** * Copyright (C) 2013 by Eike Hein * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * 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., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ #ifndef DRAGHELPER_H #define DRAGHELPER_H #include #include #include "milou_export.h" class QQuickItem; class QMimeData; namespace Milou { class MILOU_EXPORT DragHelper : public QObject { Q_OBJECT Q_PROPERTY(int dragIconSize READ dragIconSize WRITE setDragIconSize NOTIFY dragIconSizeChanged) public: DragHelper(QObject *parent = 0); ~DragHelper(); int dragIconSize() const; void setDragIconSize(int size); Q_INVOKABLE bool isDrag(int oldX, int oldY, int newX, int newY) const; + // TODO KF6 merge the two Q_INVOKABLE void startDrag(QQuickItem* item, QMimeData *mimeData, const QIcon &icon = QIcon()); + Q_INVOKABLE void startDrag(QQuickItem* item, QMimeData *mimeData, const QString &iconName); Q_SIGNALS: void dragIconSizeChanged() const; void dropped() const; private: int m_dragIconSize; Q_INVOKABLE void doDrag(QQuickItem* item, QMimeData *mimeData, const QIcon &icon = QIcon()) const; }; } #endif