mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-20 06:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not allow the drop target to erase an old column

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-01-06 23:30:46 -02:00 • committed by Dirk Hohndel
parent a96e0e1ec1
commit 9511ee0294
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
qt-ui/divelogimportdialog.cpp
View file

@ -163,18 +163,23 @@ void ColumnDropCSVView::dropEvent(QDropEvent *event)
if (!curr.isValid() || curr.row() != 0) if (!curr.isValid() || curr.row() != 0)
return; return;
event->acceptProposedAction();
const QMimeData *mimeData = event->mimeData(); const QMimeData *mimeData = event->mimeData();
if (mimeData->data(subsurface_mimedata).count()) { if (!mimeData->data(subsurface_mimedata).count())
if (event->source() != this) { return;
QVariant value = QString(mimeData->data(subsurface_mimedata));
model()->setData(curr, value); if (event->source() == this ) {
} else { QString value_old = QString(mimeData->data(subsurface_mimedata));
QString value_old = QString(mimeData->data(subsurface_mimedata)); QString value_new = curr.data().toString();
QString value_new = curr.data().toString(); ColumnNameResult *m = qobject_cast<ColumnNameResult*>(model());
ColumnNameResult *m = qobject_cast<ColumnNameResult*>(model()); m->swapValues(value_old, value_new);
m->swapValues(value_old, value_new); event->acceptProposedAction();
} return;
}
if (curr.data().toString().isEmpty()) {
QVariant value = QString(mimeData->data(subsurface_mimedata));
model()->setData(curr, value);
event->acceptProposedAction();
} }
} }